Skip to content

preparations for musllinux #9982

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

Merged
merged 7 commits into from
Sep 19, 2021
Merged

preparations for musllinux #9982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
282a9bc
preparations for musllinux
liath Aug 31, 2021
4c4317c
fix lint concern
liath Sep 1, 2021
ceab49c
split manylinux and musllinux arch list
liath Sep 1, 2021
c947151
make manylinux regex slightly more legible
liath Sep 4, 2021
dae2be2
clarify places where manylinux and musllinux overlap
liath Sep 18, 2021
52d3bfb
use cleaner syntax to merge manylinux sets
liath Sep 18, 2021
df48de8
clean some lint
liath Sep 18, 2021
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
1 change: 1 addition & 0 deletions tests/unit/forklift/test_legacy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2573,6 +2573,7 @@ def test_upload_fails_without_permission(self, pyramid_config, db_request):
"manylinux_2_17_ppc64",
"manylinux_2_17_ppc64le",
"manylinux_3_0_s390x",
"musllinux_1_1_x86_64",
"macosx_10_6_intel",
"macosx_10_13_x86_64",
"macosx_11_0_x86_64",
Expand Down
17 changes: 10 additions & 7 deletions warehouse/forklift/legacy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,18 @@ def namespace_stdlib_list(module_list):
"11",
}

# manylinux pep600 is a little more complicated:
_manylinux_platform_re = re.compile(r"manylinux_(\d+)_(\d+)_(?P<arch>.*)")
_manylinux_arches = {
# manylinux pep600 and musllinux pep656 are a little more complicated:
_linux_platform_re = re.compile(r"(?P<libc>(many|musl))linux_(\d+)_(\d+)_(?P<arch>.*)")
_jointlinux_arches = {
"x86_64",
"i686",
"aarch64",
"armv7l",
"ppc64",
"ppc64le",
"s390x",
}
_manylinux_arches = _jointlinux_arches | {"ppc64"}
_musllinux_arches = _jointlinux_arches


# Actual checking code;
Expand All @@ -167,9 +168,11 @@ def _valid_platform_tag(platform_tag):
and m.group("arch") in _macosx_arches
):
return True
m = _manylinux_platform_re.match(platform_tag)
if m and m.group("arch") in _manylinux_arches:
return True
m = _linux_platform_re.match(platform_tag)
if m and m.group("libc") == "musl":
return m.group("arch") in _musllinux_arches
if m and m.group("libc") == "many":
return m.group("arch") in _manylinux_arches
return False


Expand Down