mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-17 02:52:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Always ignore cp2 wheels in resolution (#7902)

Browse source 
## Summary

Closes #7873.
This commit is contained in:
Charlie Marsh 2024-10-03 18:35:03 +01:00 • committed by GitHub
parent 41fdecf457
commit 312eeb8f57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/uv-resolver/src/requires_python.rs
View file

@ -353,8 +353,11 @@ impl RequiresPython {
true
} else if abi_tag == "none" {
wheel.python_tag.iter().any(|python_tag| {
// Remove `py2-none-any` and `py27-none-any`.
if python_tag.starts_with("py2") {
// Remove `py2-none-any` and `py27-none-any` and analogous `cp` and `pp` tags.
if python_tag.starts_with("py2")
|| python_tag.starts_with("cp2")
|| python_tag.starts_with("pp2")
{
return false;
}
@ -724,9 +727,9 @@ mod tests {
"black-24.4.2-cp310-cp310-win_amd64.whl",
"black-24.4.2-cp310-none-win_amd64.whl",
"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",
"watchfiles-0.22.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl",
];
for wheel_name in wheel_names {
assert!(
@ -753,6 +756,7 @@ mod tests {
let wheel_names = &[
"PySocks-1.7.1-py27-none-any.whl",
"black-24.4.2-cp39-cp39-win_amd64.whl",
"psutil-6.0.0-cp27-none-win32.whl",
"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",