Skip to content

Commit b30a845

Browse files
Merge branch 'cursor/fix-musllinux-platform-tag-validation-34bb' into craft-release-d92820d70698c40ae5cfa439edec96d93db8522c
2 parents 224159d + 68f231f commit b30a845

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

packages.ini

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,6 +1193,9 @@ python_versions = <3.13
11931193
[oauthlib==3.2.1]
11941194
[oauthlib==3.2.2]
11951195

1196+
[objectstore-client==0.0.1]
1197+
python_versions = >=3.13.1
1198+
11961199
[openai==0.27.0]
11971200
[openai==0.27.8]
11981201
[openai==1.3.5]
@@ -1820,6 +1823,8 @@ python_versions = <3.13
18201823
[rsa==4.9]
18211824
[rsa==4.9.1]
18221825

1826+
[ruff==0.14.2]
1827+
18231828
[ruyaml==0.91.0]
18241829

18251830
[s3transfer==0.5.2]
@@ -1964,6 +1969,10 @@ python_versions = <3.13
19641969
[sentry-arroyo==2.29.5]
19651970
[sentry-arroyo==2.29.6]
19661971
[sentry-arroyo==2.29.7]
1972+
[sentry-arroyo==2.30.0]
1973+
[sentry-arroyo==2.31.0]
1974+
[sentry-arroyo==2.31.1]
1975+
[sentry-arroyo==2.31.2]
19671976

19681977
[sentry-cli==2.14.3]
19691978
[sentry-cli==2.14.4]
@@ -2078,6 +2087,7 @@ python_versions = <3.13
20782087
[sentry-devenv==1.22.1]
20792088
[sentry-devenv==1.22.2]
20802089
[sentry-devenv==1.23.0]
2090+
[sentry-devenv==1.24.0]
20812091

20822092
[sentry-forked-django-stubs==4.2.6.post1]
20832093
[sentry-forked-django-stubs==4.2.6.post2]
@@ -2219,6 +2229,11 @@ python_versions = <3.13
22192229
[sentry-infra-tools==1.16.0]
22202230
[sentry-infra-tools==1.16.1]
22212231
[sentry-infra-tools==1.16.2]
2232+
[sentry-infra-tools==1.17.0]
2233+
[sentry-infra-tools==1.17.1]
2234+
[sentry-infra-tools==1.17.2]
2235+
[sentry-infra-tools==1.17.3]
2236+
[sentry-infra-tools==1.17.4]
22222237

22232238
[sentry-jsonish==0.0.1]
22242239
[sentry-jsonish==0.0.2]
@@ -2444,6 +2459,9 @@ python_versions = <3.13
24442459
[sentry-kafka-schemas==2.1.8]
24452460
[sentry-kafka-schemas==2.1.9]
24462461
[sentry-kafka-schemas==2.1.10]
2462+
[sentry-kafka-schemas==2.1.11]
2463+
[sentry-kafka-schemas==2.1.13]
2464+
[sentry-kafka-schemas==2.1.14]
24472465

24482466
[sentry-ophio==0.1.1]
24492467
python_versions = >=3.10
@@ -2541,6 +2559,7 @@ python_versions = >=3.10
25412559
[sentry-protos==0.4.0]
25422560
[sentry-protos==0.4.1]
25432561
[sentry-protos==0.4.2]
2562+
[sentry-protos==0.4.3]
25442563

25452564
[sentry-redis-tools==0.1.1]
25462565
[sentry-redis-tools==0.1.2]
@@ -2621,6 +2640,7 @@ python_versions = >=3.10
26212640
[sentry-relay==0.9.15]
26222641
[sentry-relay==0.9.16]
26232642
[sentry-relay==0.9.17]
2643+
[sentry-relay==0.9.19]
26242644

26252645
[sentry-script-runner==0.1.5]
26262646
[sentry-script-runner==0.1.6]
@@ -2776,6 +2796,7 @@ python_versions = >=3.10
27762796
[sentry-sdk==2.41.0]
27772797
[sentry-sdk==2.42.0]
27782798
[sentry-sdk==2.42.1]
2799+
[sentry-sdk==2.43.0]
27792800
[sentry-sdk==3.0.0a1]
27802801
[sentry-sdk==3.0.0a2]
27812802
[sentry-sdk==3.0.0a3]

tests/validate_test.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,16 @@ def test_pythons_to_check_specific_cpython_tag():
6969
assert ret == ("python3.11",)
7070

7171

72+
def test_pythons_to_check_multi_platform_with_musllinux():
73+
"""Test that wheels with both compatible and incompatible platform tags are accepted."""
74+
# Simulates a wheel like: py3-none-any.musllinux_1_2_x86_64
75+
# The py3-none-any tag is always compatible, while musllinux might not be on all systems
76+
tags = parse_tag("py3-none-any") | parse_tag("py3-none-musllinux_1_2_x86_64")
77+
ret = validate._pythons_to_check(tags)
78+
# Should succeed because at least one tag (py3-none-any) is compatible
79+
assert ret == ("python3.11", "python3.12", "python3.13")
80+
81+
7282
def test_top_imports_record(tmp_path):
7383
whl = tmp_path.joinpath("distlib.whl")
7484
with zipfile.ZipFile(whl, "w") as zipf:

validate.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ def _pythons_to_check(tags: frozenset[Tag]) -> tuple[str, ...]:
5656
continue
5757
elif tag.interpreter.startswith("py3"):
5858
for py in PYTHONS:
59-
if tag not in packaging.tags.compatible_tags(py):
60-
raise AssertionError(f"{tag} is not compatible with python {py}")
61-
ret.update(_py_exe(*py) for py in PYTHONS)
59+
if tag in packaging.tags.compatible_tags(py):
60+
ret.add(_py_exe(*py))
6261
else:
6362
raise AssertionError(f"unexpected tag: {tag}")
6463

0 commit comments

Comments
 (0)