Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow py3x-none tags in newer than Python 3.x #7867

Merged
merged 1 commit into from
Oct 3, 2024
Merged

Allow py3x-none tags in newer than Python 3.x #7867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crates/uv-resolver/src/requires_python.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,9 @@ impl RequiresPython {
let Some(minor) = python_tag
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this entire part make sense? In the example above, I thought cp36 was a lower-bound, so it would match==3.10.*.

Copy link
Member Author

@konstin konstin Oct 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cpxx-<...>-<...> as a python tag only really makes sense in combination with a matching ABI tag, cp311-none doesn't really make sense: why are you requiring CPython if you're not requiring its ABI? For pragmatic reasons, we're following pip (on python 3.12), cp is an exact python tag unless we use abi3, then it's a minimum version, while py is a lower bound:

$ pip debug --verbose | grep manylinux_2_39_x86_64
WARNING: This command is only meant for debugging. Do not use this with automation for parsing and getting these details, since the output and options of this command may change without notice.
  cp312-cp312-manylinux_2_39_x86_64
  cp312-abi3-manylinux_2_39_x86_64
  cp312-none-manylinux_2_39_x86_64
  cp311-abi3-manylinux_2_39_x86_64
  cp310-abi3-manylinux_2_39_x86_64
  cp39-abi3-manylinux_2_39_x86_64
  cp38-abi3-manylinux_2_39_x86_64
  cp37-abi3-manylinux_2_39_x86_64
  cp36-abi3-manylinux_2_39_x86_64
  cp35-abi3-manylinux_2_39_x86_64
  cp34-abi3-manylinux_2_39_x86_64
  cp33-abi3-manylinux_2_39_x86_64
  cp32-abi3-manylinux_2_39_x86_64
  py312-none-manylinux_2_39_x86_64
  py3-none-manylinux_2_39_x86_64
  py311-none-manylinux_2_39_x86_64
  py310-none-manylinux_2_39_x86_64
  py39-none-manylinux_2_39_x86_64
  py38-none-manylinux_2_39_x86_64
  py37-none-manylinux_2_39_x86_64
  py36-none-manylinux_2_39_x86_64
  py35-none-manylinux_2_39_x86_64
  py34-none-manylinux_2_39_x86_64
  py33-none-manylinux_2_39_x86_64
  py32-none-manylinux_2_39_x86_64
  py31-none-manylinux_2_39_x86_64
  py30-none-manylinux_2_39_x86_64

.strip_prefix("cp3")
.or_else(|| python_tag.strip_prefix("pp3"))
.or_else(|| python_tag.strip_prefix("py3"))
else {
// We also return true for bounds such as `py36`, where the Python version
// is a lower bound (redundant with `requires-python`)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if the version is greater than our own upper-bound on Python? E.g., py310 but the user has == 3.8.*.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we don't handle this at all here yet (upper bounds).

return true;
};
let Ok(minor) = minor.parse::<u64>() else {
Expand Down Expand Up @@ -725,6 +726,7 @@ mod tests {
"cbor2-5.6.4-py3-none-any.whl",
"watchfiles-0.22.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl",
"dearpygui-1.11.1-cp312-cp312-win_amd64.whl",
"solace_pubsubplus-1.8.0-py36-none-manylinux_2_12_x86_64.whl",
];
for wheel_name in wheel_names {
assert!(
Expand Down Expand Up @@ -754,7 +756,6 @@ mod tests {
"psutil-6.0.0-cp36-cp36m-win32.whl",
"pydantic_core-2.20.1-pp39-pypy39_pp73-win_amd64.whl",
"torch-1.10.0-cp36-none-macosx_10_9_x86_64.whl",
"torch-1.10.0-py36-none-macosx_10_9_x86_64.whl",
];
for wheel_name in wheel_names {
assert!(
Expand Down
3 changes: 3 additions & 0 deletions crates/uv/tests/snapshots/ecosystem__transformers-lock-file.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2388,6 +2388,9 @@ dependencies = [
sdist = { url = "https://files.pythonhosted.org/packages/99/1a/472900644359cdd208d1fbe71706bdeecbc6e8db2e39c35ebe89459e9172/multiprocess-0.70.12.2.zip", hash = "sha256:206bb9b97b73f87fec1ed15a19f8762950256aa84225450abc7150d02855a083", size = 3308461 }
wheels = [
{ url = "https://files.pythonhosted.org/packages/97/0a/c9e66e0c3fd4f2a9404c91ba1a967858041c865c958746bb6939454eed10/multiprocess-0.70.12.2-pp27-none-any.whl", hash = "sha256:a9f58945edb234591684c0a181b744a3231643814ef3a8f47cea9a2073b4b2bb", size = 82019 },
{ url = "https://files.pythonhosted.org/packages/df/d0/c3011a5bb77f307e68682a5046cce1a2c6591267bf24b5bf3fc4130bb39d/multiprocess-0.70.12.2-py36-none-any.whl", hash = "sha256:b3f866f7d9c7acc1a9cb1b6063a29f5cb140ff545b35b71fd4bfdac6f19d75fa", size = 106969 },
{ url = "https://files.pythonhosted.org/packages/aa/d8/d7bbcef5c03890f5fe983d8419b0c5236af3657c5aa9bddf1991a6ed813a/multiprocess-0.70.12.2-py37-none-any.whl", hash = "sha256:6aa67e805e50b6e9dfc56dd0f0c85ac3409e6791d4ec5405c5f9bc0a47d745a4", size = 112117 },
{ url = "https://files.pythonhosted.org/packages/e6/22/b09b8394f8c86ff0cfebd725ea96bba0accd4a4b2be437bcba6a0cf7d1c3/multiprocess-0.70.12.2-py38-none-any.whl", hash = "sha256:85941e650c277af44fc82e3e97faacb920e5ce3615238b540cbad4012d6f60e9", size = 128323 },
{ url = "https://files.pythonhosted.org/packages/e3/12/c1c7b5574a574a5bc898c8656b0ab8514d0609356b3ca18180e2ae94c2f7/multiprocess-0.70.12.2-py39-none-any.whl", hash = "sha256:6f812a1d3f198b7cacd63983f60e2dc1338bd4450893f90c435067b5a3127e6f", size = 128693 },
]

Expand Down
Loading