283 commits

Author	SHA1	Message	Date
konsti	46bb18f06e	Track file index (#452) ... Track the index (or at least its url) where we got a file from across the source code. Fixes #448	2023-11-20 08:48:16 +00:00
Charlie Marsh	6fd582f8b9	Rename puffin-distribution to distribution-types (#458) ... ## Summary This crate only contains types, and I want to introduce a new crate for all _operations_ on distributions, so this feels like a more natural name given we also have `pypi-types`.	2023-11-20 09:40:26 +01:00
konsti	2fed14fdc6	Optional serde feature for distribution-filename (#461) ... https://github.com/astral-sh/puffin/pull/459#discussion_r1398482972	2023-11-19 19:53:32 +00:00
konsti	255edf4445	Serde support for WheelFilename through str repr (#459) ... I need this later, splitting out for PR size	2023-11-19 19:43:14 +00:00
Charlie Marsh	3df3110800	Use shortened anyhow::Result everywhere (#457)	2023-11-19 19:26:21 +00:00
Charlie Marsh	380030bb5c	Pin all resolver tests using --exclude-newer (#456) ... Uses yesterday's date, which should make it much less likely that our tests become stale over time. Closes https://github.com/astral-sh/puffin/issues/449.	2023-11-19 15:10:57 +00:00
konsti	24f00f5a33	Create cache dir before canonicalize (#454) ... `fs::canonicalize` fails when the directory does not exist, which i missed in #453	2023-11-19 13:49:13 +00:00
konsti	ab60233131	Use absolute cache paths (#453) ... Previously, git requirements would fail when setting `--cache-dir`: ```console $ cargo run --bin puffin -- pip-compile --cache-dir cache-all-kinds scripts/benchmarks/requirements/all-kinds.in error: Failed to build distribution from URL: git+https://github.com/pydantic/pydantic-extra-types.git Caused by: Invalid path URL: cache-all-kinds/git-v0/db/b49ffcfeb6c2e9d8 ``` The cause is using a relative and not an absolute path, which `Url` needs, the solution is to turn the cache dir into an absolute path. This never showed up in the tests since the tests use absolute temp dirs for everything.	2023-11-19 13:32:32 +00:00
konsti	dd4347980a	Fix tests: Certifi got an update (#451)	2023-11-19 12:10:54 +00:00
Zanie Blue	5dedfeb097	Fix import of CacheArgs in puffin-cli (#447) ... ``` error[E0432]: unresolved imports `puffin_cache::CacheArgs`, `puffin_cache::CacheDir` --> crates/puffin-cli/src/main.rs:11:20 | 11 | use puffin_cache::{CacheArgs, CacheDir}; | ^^^^^^^^^ ^^^^^^^^ no `CacheDir` in the root | | | no `CacheArgs` in the root | note: found an item that was configured out --> /Users/mz/eng/src/astral-sh/puffin/crates/puffin-cache/src/lib.rs:7:15 | 7 | pub use cli::{CacheArgs, CacheDir}; | ^^^^^^^^^ = note: the item is gated behind the `clap` feature note: found an item that was configured out --> /Users/mz/eng/src/astral-sh/puffin/crates/puffin-cache/src/lib.rs:7:26 | 7 | pub use cli::{CacheArgs, CacheDir}; | ^^^^^^^^ = note: the item is gated behind the `clap` feature For more information about this error, try `rustc --explain E0432`. error: could not compile `puffin-cli` (bin "puffin") due to previous error ```	2023-11-17 15:35:01 -05:00
Charlie Marsh	03599d2bb4	Split resolver inputs into manifest and options (#446) ... ## Summary This is a refactor to address a TODO in the build context whereby we aren't respecting the resolution options in recursive resolutions. Now, the options are split out from the resolution _manifest_, and shared across the build context tree.	2023-11-17 18:53:53 +00:00
konsti	9db6644be6	Test requirements script (#382) ... This script can compare different requirements between pip(-compile) and puffin across python versions, with debug and release builds. Examples: ```shell scripts/compare_with_pip/compare_with_pip.py scripts/compare_with_pip/compare_with_pip.py -p 3.10 scripts/compare_with_pip/compare_with_pip.py --release -p 3.9 --target 'transformers[deepspeed-testing,dev-tensorflow]' ``` It found a bunch of fixed bugs, e.g. the lack of yanked package handling and source dist handling, as well as #423, which is currently most of the output. Example output: https://gist.github.com/konstin/9ccf8dc7c2dcca737bf705429ced4892 #443 should be merged first	2023-11-17 18:26:55 +00:00
konsti	bf71e7adcf	Add graphviz output to puffin-dev resolve-cli (#443) ... I added output in graphviz DOT format to `puffin-dev resolve-cli` to help with debugging resolutions. This requires tracking the requested ranges in the graph. I also fixed the direction of the graph. Output for `black`: ```dot digraph { 0 [ label="click\n8.1.7"] 1 [ label="black\n23.11.0"] 2 [ label="packaging\n23.2"] 3 [ label="mypy-extensions\n1.0.0"] 4 [ label="tomli\n2.0.1"] 5 [ label="pathspec\n0.11.2"] 6 [ label="typing-extensions\n4.8.0"] 7 [ label="platformdirs\n4.0.0"] 1 -> 0 [ label=">=8.0.0"] 1 -> 3 [ label=">=0.4.3"] 1 -> 5 [ label=">=0.9.0"] 1 -> 4 [ label=">=1.1.0"] 1 -> 6 [ label=">=4.0.1"] 1 -> 2 [ label=">=22.0"] 1 -> 7 [ label=">=2"] } ```  transformers:  jupyter: 	2023-11-17 18:16:24 +00:00
Zanie Blue	d39e9b3499	Remove duplicate cache_dir argument from puffin-dev resolve-cli (#445)	2023-11-17 17:17:00 +00:00
Zanie Blue	221751487c	Use UnusableDependencies for URL dependency conflicts (#425) ... Extends #424 with support for URL dependency incompatibilities. Requires changes to `miette` to prevent URLs from being word wrapped; accepted upstream in https://github.com/zkat/miette/pull/321	2023-11-17 08:28:12 -06:00
Charlie Marsh	2094680cdd	Add a warn_user_once! macro (#442) ... Closes https://github.com/astral-sh/puffin/issues/429.	2023-11-17 02:34:06 +00:00
Charlie Marsh	25fcee0d9f	Avoid using incompatible wheels for source distribution-less packages (#441) ... We're willing to use platform-incompatible wheels during resolution, to quicken access to metadata... But we should avoid choosing an incompatible wheel if the package lacks a source distribution since, in that case, we definitely won't be able to install it. Closes https://github.com/astral-sh/puffin/issues/439.	2023-11-17 02:10:54 +00:00
Charlie Marsh	b1c29447df	Use temp_dir casing everywhere (#440)	2023-11-16 21:04:10 +00:00
konsti	1883dbdc21	Always¹ clear temporary directories (#437) ... Always¹ clear the temporary directories we create. * Clear source dist downloads: Previously, the temporary directories would remain in the cache dir, now they are cleared properly * Clear wheel file downloads: Delete the `.whl` file, we only need to cache the unpacked wheel * Consistent handling of cache arguments: Abstract the handling for CLI cache args away, again making sure we remove the `--no-cache` temp dir. There are no more `into_path()` calls that persist `TempDir`s that i could find. ¹Assuming drop is run, and deleting the directory doesn't silently error.	2023-11-16 20:49:48 +00:00
Zanie Blue	0d9d4f9fca	Add an UnusableDependencies incompatibility kind and use for conflicting versions (#424) ... Addresses https://github.com/astral-sh/puffin/issues/309#issuecomment-1792648969 Similar to #338 this throws an error when merging versions results in an empty set. Instead of propagating that error, we capture it and return a new dependency type of `Unusable`. Unusable dependencies are a new incompatibility kind which includes an arbitrary "reason" string that we present to the user. Adding a new incompatibility kind requires changes to the vendored pubgrub crate. We could use this same incompatibility kind for conflicting urls as in #284 which should allow the solver to backtrack to another valid version instead of failing (see #425). Unlike #383 this does not require changes to PubGrub's package mapping model. I think in the long run we'll want PubGrub to accept multiple versions per package to solve this specific issue, but we're interested in it being merged upstream first. This pull request is just using the issue as a simple case to explore adding a new incompatibility type. We may or may not be able convince them to add this new incompatibility type upstream. As discussed in https://github.com/pubgrub-rs/pubgrub/issues/152, we may want a more general incompatibility kind instead which can be used for arbitrary problems. An upstream pull request has been opened for discussion at https://github.com/pubgrub-rs/pubgrub/pull/153. Related to: - https://github.com/pubgrub-rs/pubgrub/issues/152 - #338 - #383 --------- Co-authored-by: konsti <konstin@mailbox.org>	2023-11-16 20:02:06 +00:00
Zanie Blue	832058dbba	Switch from vendored PubGrub to a fork (#438) ... A fork will let us stay up to date with the upstream while replaying our work on top of it. I expect a similar workflow to the RustPython-Parser fork we maintained, except that I wrote an automation to create tags for each commit on the fork (https://github.com/zanieb/pubgrub/pull/2) so we do not need to manually tag and document each commit. To update with the upstream: - Rebase our fork's `main` branch on top of the latest changes in upstream's `dev` branch - Force push, overwriting our `main` branch history - Change the commit hash here to the last commit on `main` in our fork Since we automatically tag each commit on the fork, we should never lose the commits that are dropped from `main` during rebase.	2023-11-16 13:49:19 -06:00
konsti	e41ec12239	Option to resolve at a fixed timestamp with pip-compile --exclude-newer YYYY-MM-DD (#434) ... This works by filtering out files with a more recent upload time, so if the index you use does not provide upload times, the results might be inaccurate. pypi provides upload times for all files. This is, the field is non-nullable in the warehouse schema, but the simple API PEP does not know this field. If you have only pypi dependencies, this means deterministic, reproducible(!) resolution. We could try doing the same for git repos but it doesn't seem worth the effort, i'd recommend pinning commits since git histories are arbitrarily malleable and also if you care about reproducibility and such you such not use git dependencies but a custom index. Timestamps are given either as RFC 3339 timestamps such as `2006-12-02T02:07:43Z` or as UTC dates in the same format such as `2006-12-02`. Dates are interpreted as including this day, i.e. until midnight UTC that day. Date only is required to make this ergonomic and midnight seems like an ergonomic choice. In action for `pandas`: ```console $ target/debug/puffin pip-compile --exclude-newer 2023-11-16 target/pandas.in Resolved 6 packages in 679ms # This file was autogenerated by Puffin v0.0.1 via the following command: # target/debug/puffin pip-compile --exclude-newer 2023-11-16 target/pandas.in numpy==1.26.2 # via pandas pandas==2.1.3 python-dateutil==2.8.2 # via pandas pytz==2023.3.post1 # via pandas six==1.16.0 # via python-dateutil tzdata==2023.3 # via pandas $ target/debug/puffin pip-compile --exclude-newer 2022-11-16 target/pandas.in Resolved 5 packages in 655ms # This file was autogenerated by Puffin v0.0.1 via the following command: # target/debug/puffin pip-compile --exclude-newer 2022-11-16 target/pandas.in numpy==1.23.4 # via pandas pandas==1.5.1 python-dateutil==2.8.2 # via pandas pytz==2022.6 # via pandas six==1.16.0 # via python-dateutil $ target/debug/puffin pip-compile --exclude-newer 2021-11-16 target/pandas.in Resolved 5 packages in 594ms # This file was autogenerated by Puffin v0.0.1 via the following command: # target/debug/puffin pip-compile --exclude-newer 2021-11-16 target/pandas.in numpy==1.21.4 # via pandas pandas==1.3.4 python-dateutil==2.8.2 # via pandas pytz==2021.3 # via pandas six==1.16.0 # via python-dateutil ```	2023-11-16 19:46:17 +00:00
konsti	0d455ebd06	Always use puffin as binary name (#435) ... It doesn't matter how exactly the user called puffin, the lockfile should look the same either way.	2023-11-16 19:05:46 +01:00
konsti	751f7fa9c6	Improve PEP 691 compatibility (#428) ... [PEP 691](https://peps.python.org/pep-0691/#project-detail) has slightly different, more relaxed rules around file metadata. These changes are now reflected in the `File` struct. This will make it easier to support alternative indices. I had expected that i need to introduce a separate type for that, so i'm happy it's two `Option`s more and an alias. Part of #412	2023-11-16 19:03:44 +01:00
konsti	3a4988f999	Small test cleanup after #431 (#433) ... Remove unused filters after #431	2023-11-16 11:22:47 +00:00
konsti	c0339893e7	Use sys.executable as python root path (#431) ... Previously, we were assuming that `which <python>` return the path to the python executable. This is not true when using pyenv shims, which are bash scripts. Instead, we have to use `sys.executable`. Luckily, we're already querying the python interpreter and can do it in that pass. We are also not allowed to cache the execution of the python interpreter through the shim because pyenv might change the target. As a heuristic, we check whether `sys.executable`, the real binary, is the same our canonicalized `which` result. --------- Co-authored-by: Zanie Blue <contact@zanie.dev>	2023-11-16 12:16:49 +01:00
Charlie Marsh	d3caf9ae86	Choose most-compatible wheel in resolver and installer (#422) ... ## Summary This PR implements logic to sort wheels by priority, where priority is defined as preferring more "specific" wheels over less "specific" wheels. For example, in the case of Black, my machine now selects `black-23.11.0-cp311-cp311-macosx_11_0_arm64.whl`, whereas sorting by lowest priority instead gives me `black-23.11.0-py3-none-any.whl`. As part of this change, I've also modified the resolver to fallback to using incompatible wheels when determining package metadata, if no compatible wheels are available. The `VersionMap` was also moved out of `resolver.rs` and into its own file with a wrapper type, for clarity. Closes https://github.com/astral-sh/puffin/issues/380. Closes https://github.com/astral-sh/puffin/issues/421.	2023-11-15 18:22:11 +00:00
konsti	1147a4de14	Simpler and more resilient pip compile tests (#426) ... The pip compile test now explicitly set their python version and `puffin venv` resolves e.g. `python3.12` correctly now. The venv creation is moved to a shared method	2023-11-15 18:32:33 +01:00
Charlie Marsh	a20325f184	Remove unnecessary clones in resolver (#420)	2023-11-13 21:00:52 -05:00
Charlie Marsh	13ba4405aa	Update README and crates manifest (#419)	2023-11-14 01:20:07 +00:00
konsti	bacf1dc911	Filter out yanked files (#413) ... Implement two behaviors for yanked versions: * During `pip-compile`, yanked versions are filtered out entirely, we currently treat them is if they don't exist. This is leads to confusing error messages because a version that does exist seems to have suddenly disappeared. * During `pip-sync`, we warn when we fetch a remote distribution and it has been yanked. We currently don't warn on cached or installed distributions that have been yanked.	2023-11-13 20:58:50 +00:00
Charlie Marsh	28ec4e79f0	Co-locate lenient requirement parsing (#418) ... No behavior changes.	2023-11-13 15:46:21 -05:00
Charlie Marsh	437d4fb87e	Add trailing-comma fix to lenient requirements (#417) ... Closes https://github.com/astral-sh/puffin/issues/408.	2023-11-13 20:20:57 +00:00
Charlie Marsh	582c94cec3	Add missing-dot fix to lenient requirements (#416) ... Part of https://github.com/astral-sh/puffin/issues/408.	2023-11-13 20:17:01 +00:00
Charlie Marsh	0af2f7e39f	Use anstream to avoid writing colorized output (#415) ... A more robust solution to avoiding colorized output by ensuring we write to `stdout` and `stderr` via the [`anstream`](https://docs.rs/anstream/latest/anstream/) crate. Closes https://github.com/astral-sh/puffin/issues/393.	2023-11-13 20:00:12 +00:00
konsti	76a41066ac	Filter out incompatible dists (#398) ... Filter out source dists and wheels whose `requires-python` from the simple api is incompatible with the current python version. This change showed an important problem: When we use a fake python version for resolving, building source distributions breaks down because we can only build with versions we actually have. This change became surprisingly big. The tests now require python 3.7 to be installed, but changing that would mean an even bigger change. Fixes #388	2023-11-13 17:14:07 +01:00
konsti	81c9cd0d4a	Print url for bad json error (#409) ... Split out from #382	2023-11-13 11:41:20 +00:00
konsti	fa423b8751	Backend path is supported (#405) ... The check is outdated now	2023-11-13 08:19:20 +00:00
Zanie Blue	beadd3274a	Improve debug log version display (#403) ... Follow-up to https://github.com/astral-sh/puffin/pull/346 for some debug messages	2023-11-10 17:07:29 -06:00
Charlie Marsh	06b312de7e	Overwrite existing files when hardlinking (#402) ... ## Summary Closes https://github.com/astral-sh/puffin/issues/390. ## Test Plan Installed `jupyter_core==5.5.0`, then removed the `jupyter_core` and `jupyter_core-5.5.0.dist-info` directories from my virtualenv manually, but left `jupyter.py`. I then re-ran `puffin pip-compile`, and verified that it errored on `main` but succeeded here.	2023-11-10 20:24:19 +00:00
Charlie Marsh	56a4b51eb6	Refactor hardlink fallback to use an enum (#401) ... Makes an invalid state unrepresentable (`first_try_hard_linking = true`, `use_copy_fallback` = true`).	2023-11-10 15:18:51 -05:00
Andrew Gallant	ff4d079dc9	pep508-rs: remove \x20 trailing whitespace hack (#400) ... ... we just remove the trailing whitespace from the input and that resolves things. Thanks @konstin for pointing this out! Ref https://github.com/astral-sh/puffin/pull/399#discussion_r1389854823	2023-11-10 15:11:29 -05:00
Charlie Marsh	e8108cb28b	Remove __pycache__ directories when uninstalling (#397) ... According to the [packaging documentation](https://packaging.python.org/en/latest/specifications/binary-distribution-format/#binary-distribution-format), "uninstallers should be smart enough to remove .pyc even if it is not mentioned in RECORD". Previously, we weren't handling this case, so if you installed via Puffin, then imported a file (to trigger bytecode compilation), then uninstalled, we'd leave spare `__pycache__` directories around. Closes https://github.com/astral-sh/puffin/issues/395.	2023-11-10 14:55:33 -05:00
Andrew Gallant	63f7f65190	change global allocator to jemalloc (and mimalloc on Windows) (#399) ... This copies the allocator configuration used in the Ruff project. In particular, this gives us an instant 10% win when resolving the top 1K PyPI packages: $ hyperfine \ "./target/profiling/puffin-dev-main resolve-many --cache-dir cache-docker-no-build --no-build pypi_top_8k_flat.txt --limit 1000 2> /dev/null" \ "./target/profiling/puffin-dev resolve-many --cache-dir cache-docker-no-build --no-build pypi_top_8k_flat.txt --limit 1000 2> /dev/null" Benchmark 1: ./target/profiling/puffin-dev-main resolve-many --cache-dir cache-docker-no-build --no-build pypi_top_8k_flat.txt --limit 1000 2> /dev/null Time (mean ± σ): 974.2 ms ± 26.4 ms [User: 17503.3 ms, System: 2205.3 ms] Range (min … max): 943.5 ms … 1015.9 ms 10 runs Benchmark 2: ./target/profiling/puffin-dev resolve-many --cache-dir cache-docker-no-build --no-build pypi_top_8k_flat.txt --limit 1000 2> /dev/null Time (mean ± σ): 883.1 ms ± 23.3 ms [User: 14626.1 ms, System: 2542.2 ms] Range (min … max): 849.5 ms … 916.9 ms 10 runs Summary './target/profiling/puffin-dev resolve-many --cache-dir cache-docker-no-build --no-build pypi_top_8k_flat.txt --limit 1000 2> /dev/null' ran 1.10 ± 0.04 times faster than './target/profiling/puffin-dev-main resolve-many --cache-dir cache-docker-no-build --no-build pypi_top_8k_flat.txt --limit 1000 2> /dev/null' I was moved to do this because I noticed `malloc`/`free` taking up a fairly sizeable percentage of time during light profiling. As is becoming a pattern, it will be easier to review this commit-by-commit. Ref #396 (wouldn't call this issue fixed) ----- I did also try adding a `smallvec` optimization to the `Version::release` field, but it didn't bare any fruit. I still think there is more to explore since the results I observed don't quite line up with what I expect. (So probably either my mental model is off or my measurement process is flawed.) You can see that attempt with a little more explanation here: f9528b4ecd In the course of adding the `smallvec` optimization, I also shrunk the `Version` fields from a `usize` to a `u32`. They should at least be a fixed size integer since version numbers aren't used to index memory, and I shrunk it to `u32` since it seems reasonable to assume that all version numbers will be smaller than `2^32`.	2023-11-10 14:48:59 -05:00
konsti	d8408b1783	Add source to failing metadata parsing (#387) ... Before: ``` cargo run --bin puffin-dev -q -- resolve-cli "transformers[accelerate, agents, all, audio, codecarbon, deepspeed, deepspeed-testing, dev, dev-tensorflow, dev-torch, docs, docs_specific, flax, flax-speech, ftfy, integrations, ja, modelcreation, onnx, onnxruntime, optuna, quality, ray, retrieval, sagemaker, sentencepiece, serving, sigopt, sklearn, speech, testing, tf, tf-cpu, tf-speech, timm, tokenizers, torch, torch-speech, torch-vision, torchhub, video, vision]" puffin-dev failed Caused by: No solution found when resolving: transformers[accelerate,agents,all,audio,codecarbon,deepspeed,deepspeed-testing,dev,dev-tensorflow,dev-torch,docs,docs-specific,flax,flax-speech,ftfy,integrations,ja,modelcreation,onnx,onnxruntime,optuna,quality,ray,retrieval,sagemaker,sentencepiece,serving,sigopt,sklearn,speech,testing,tf,tf-cpu,tf-speech,timm,tokenizers,torch,torch-speech,torch-vision,torchhub,video,vision] Caused by: Not a valid package or extra name: ".none". Names must start and end with a letter or digit and may only contain -, _, ., and alphanumeric characters ``` After: ``` cargo run --bin puffin-dev -q -- resolve-cli "transformers[accelerate, agents, all, audio, codecarbon, deepspeed, deepspeed-testing, dev, dev-tensorflow, dev-torch, docs, docs_specific, flax, flax-speech, ftfy, integrations, ja, modelcreation, onnx, onnxruntime, optuna, quality, ray, retrieval, sagemaker, sentencepiece, serving, sigopt, sklearn, speech, testing, tf, tf-cpu, tf-speech, timm, tokenizers, torch, torch-speech, torch-vision, torchhub, video, vision]" puffin-dev failed Caused by: No solution found when resolving: transformers[accelerate,agents,all,audio,codecarbon,deepspeed,deepspeed-testing,dev,dev-tensorflow,dev-torch,docs,docs-specific,flax,flax-speech,ftfy,integrations,ja,modelcreation,onnx,onnxruntime,optuna,quality,ray,retrieval,sagemaker,sentencepiece,serving,sigopt,sklearn,speech,testing,tf,tf-cpu,tf-speech,timm,tokenizers,torch,torch-speech,torch-vision,torchhub,video,vision] Caused by: Couldn't parse metadata in fastapi-0.10.1-py3-none-any.whl (97ac91cb7c/fastapi-0.10.1-py3-none-any.whl) Caused by: Not a valid package or extra name: ".none". Names must start and end with a letter or digit and may only contain -, _, ., and alphanumeric characters ```	2023-11-10 18:33:49 +00:00
Charlie Marsh	b3edf7c2b2	Delete any directories listed in the RECORD file (#394) ... ## Summary It looks like, when you install `pip`, it includes a bunch of `__pycache__` directories in the RECORD file (although these directories don't exist until you run `pip`). Our uninstaller assumed that the RECORD file only contained _files_. Closes https://github.com/astral-sh/puffin/issues/389.	2023-11-10 18:17:52 +00:00
Charlie Marsh	6a15950cb5	Rename Distribution to Dist in all structs and traits (#384) ... We tend to avoid abbreviations, but this one is just so long and absolutely ubiquitous.	2023-11-10 14:55:11 +00:00
konsti	5cef40d87a	Add proper caching for pypi metadata fetching kinds (#368) ... I intend this to become the main form of caching for puffin: You can make http requests, you tranform the data to what you really need, you have control over the cache key, and the cache is always json (or anything else much faster we want to replace it with as long as it's serde!)	2023-11-10 11:03:40 +00:00
konsti	d1b57acaa8	Implement PEP 517 backend-path (#385) ... Closes #192	2023-11-10 11:54:23 +01:00
Charlie Marsh	a148f9d0be	Refactor distribution types to adhere to a clear hierarchy (#369) ... ## Summary This PR refactors our `RemoteDistribution` type such that it now follows a clear hierarchy that matches the actual variants, and encodes the differences between source and built distributions: ```rust pub enum Distribution { Built(BuiltDistribution), Source(SourceDistribution), } pub enum BuiltDistribution { Registry(RegistryBuiltDistribution), DirectUrl(DirectUrlBuiltDistribution), } pub enum SourceDistribution { Registry(RegistrySourceDistribution), DirectUrl(DirectUrlSourceDistribution), Git(GitSourceDistribution), } /// A built distribution (wheel) that exists in a registry, like `PyPI`. pub struct RegistryBuiltDistribution { pub name: PackageName, pub version: Version, pub file: File, } /// A built distribution (wheel) that exists at an arbitrary URL. pub struct DirectUrlBuiltDistribution { pub name: PackageName, pub url: Url, } /// A source distribution that exists in a registry, like `PyPI`. pub struct RegistrySourceDistribution { pub name: PackageName, pub version: Version, pub file: File, } /// A source distribution that exists at an arbitrary URL. pub struct DirectUrlSourceDistribution { pub name: PackageName, pub url: Url, } /// A source distribution that exists in a Git repository. pub struct GitSourceDistribution { pub name: PackageName, pub url: Url, } ``` Most of the PR just stems downstream from this change. There are no behavioral changes, so I'm largely relying on lint, tests, and the compiler for correctness.	2023-11-10 02:45:41 +00:00