Skip to content

Commit b6554c6

Browse files
mayeutmayeut
committed
temporary workarounds
1 parent 6000c89 commit b6554c6

File tree

8 files changed

+55
-41
lines changed

8 files changed

+55
-41
lines changed

‎bin/update_docker.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ class Image(NamedTuple):
4646
Image("manylinux_2_24", "pypy_i686", "quay.io/pypa/manylinux_2_24_i686", None),
4747
Image("manylinux_2_24", "pypy_aarch64", "quay.io/pypa/manylinux_2_24_aarch64", None),
4848
# musllinux_1_1 images
49-
Image("musllinux_1_1", "x86_64", "quay.io/pypa/musllinux_1_1_x86_64", None),
50-
Image("musllinux_1_1", "i686", "quay.io/pypa/musllinux_1_1_i686", None),
51-
Image("musllinux_1_1", "aarch64", "quay.io/pypa/musllinux_1_1_aarch64", None),
52-
Image("musllinux_1_1", "ppc64le", "quay.io/pypa/musllinux_1_1_ppc64le", None),
53-
Image("musllinux_1_1", "s390x", "quay.io/pypa/musllinux_1_1_s390x", None),
49+
Image("musllinux_1_1", "x86_64", "mayeut/manylinux", "musllinux_1_1_x86_64"),
50+
Image("musllinux_1_1", "i686", "mayeut/manylinux", "musllinux_1_1_i686"),
51+
# Image("musllinux_1_1", "aarch64", "quay.io/pypa/musllinux_1_1_aarch64", None),
52+
# Image("musllinux_1_1", "ppc64le", "quay.io/pypa/musllinux_1_1_ppc64le", None),
53+
# Image("musllinux_1_1", "s390x", "quay.io/pypa/musllinux_1_1_s390x", None),
5454
]
5555

5656
config = configparser.ConfigParser()

‎cibuildwheel/__main__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
MUSLLINUX_ARCHS = (
4545
"x86_64",
4646
"i686",
47-
"aarch64",
48-
"ppc64le",
49-
"s390x",
47+
# "aarch64",
48+
# "ppc64le",
49+
# "s390x",
5050
)
5151

5252

‎cibuildwheel/linux.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ def build(options: BuildOptions) -> None:
7474
("pp", "manylinux_i686", options.manylinux_images["pypy_i686"]),
7575
("cp", "musllinux_x86_64", options.musllinux_images["x86_64"]),
7676
("cp", "musllinux_i686", options.musllinux_images["i686"]),
77-
("cp", "musllinux_aarch64", options.musllinux_images["aarch64"]),
78-
("cp", "musllinux_ppc64le", options.musllinux_images["ppc64le"]),
79-
("cp", "musllinux_s390x", options.musllinux_images["s390x"]),
77+
# ("cp", "musllinux_aarch64", options.musllinux_images["aarch64"]),
78+
# ("cp", "musllinux_ppc64le", options.musllinux_images["ppc64le"]),
79+
# ("cp", "musllinux_s390x", options.musllinux_images["s390x"]),
8080
]
8181

8282
cwd = Path.cwd()
@@ -259,6 +259,12 @@ def build(options: BuildOptions) -> None:
259259
virtualenv_env = env.copy()
260260
virtualenv_env["PATH"] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}"
261261

262+
# TODO remove me, workaround
263+
docker.call(
264+
["python", "-m", "pip", "install", "-U", "pip"],
265+
env=virtualenv_env,
266+
)
267+
262268
if options.before_test:
263269
before_test_prepared = prepare_command(
264270
options.before_test,

‎cibuildwheel/resources/build-platforms.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ python_configurations = [
3838
{ identifier = "cp38-musllinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" },
3939
{ identifier = "cp39-musllinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" },
4040
{ identifier = "cp310-musllinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" },
41-
{ identifier = "cp36-musllinux_aarch64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
42-
{ identifier = "cp37-musllinux_aarch64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
43-
{ identifier = "cp38-musllinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
44-
{ identifier = "cp39-musllinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
45-
{ identifier = "cp310-musllinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
46-
{ identifier = "cp36-musllinux_ppc64le", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
47-
{ identifier = "cp37-musllinux_ppc64le", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
48-
{ identifier = "cp38-musllinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" },
49-
{ identifier = "cp39-musllinux_ppc64le", version = "3.9", path_str = "/opt/python/cp39-cp39" },
50-
{ identifier = "cp310-musllinux_ppc64le", version = "3.10", path_str = "/opt/python/cp310-cp310" },
51-
{ identifier = "cp36-musllinux_s390x", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
52-
{ identifier = "cp37-musllinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
53-
{ identifier = "cp38-musllinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
54-
{ identifier = "cp39-musllinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
55-
{ identifier = "cp310-musllinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" },
41+
# { identifier = "cp36-musllinux_aarch64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
42+
# { identifier = "cp37-musllinux_aarch64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
43+
# { identifier = "cp38-musllinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
44+
# { identifier = "cp39-musllinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
45+
# { identifier = "cp310-musllinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
46+
# { identifier = "cp36-musllinux_ppc64le", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
47+
# { identifier = "cp37-musllinux_ppc64le", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
48+
# { identifier = "cp38-musllinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" },
49+
# { identifier = "cp39-musllinux_ppc64le", version = "3.9", path_str = "/opt/python/cp39-cp39" },
50+
# { identifier = "cp310-musllinux_ppc64le", version = "3.10", path_str = "/opt/python/cp310-cp310" },
51+
# { identifier = "cp36-musllinux_s390x", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
52+
# { identifier = "cp37-musllinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
53+
# { identifier = "cp38-musllinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
54+
# { identifier = "cp39-musllinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
55+
# { identifier = "cp310-musllinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" },
5656
]
5757

5858
[macos]

‎cibuildwheel/resources/defaults.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ manylinux-pypy_aarch64-image = "manylinux2014"
2929

3030
musllinux-x86_64-image = "musllinux_1_1"
3131
musllinux-i686-image = "musllinux_1_1"
32-
musllinux-aarch64-image = "musllinux_1_1"
33-
musllinux-ppc64le-image = "musllinux_1_1"
34-
musllinux-s390x-image = "musllinux_1_1"
32+
# musllinux-aarch64-image = "musllinux_1_1"
33+
# musllinux-ppc64le-image = "musllinux_1_1"
34+
# musllinux-s390x-image = "musllinux_1_1"
3535

3636

3737
[tool.cibuildwheel.linux]

‎cibuildwheel/resources/pinned_docker_images.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-07-25-0f995ee
33
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-07-25-cfe8a6c
44
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-07-25-cfe8a6c
55
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-07-25-cfe8a6c
6+
musllinux_1_1 = mayeut/manylinux:musllinux_1_1_x86_64
67

78
[i686]
89
manylinux1 = quay.io/pypa/manylinux1_i686:2021-07-25-0f995ee
910
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-07-25-cfe8a6c
1011
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-07-25-cfe8a6c
1112
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-07-25-cfe8a6c
13+
musllinux_1_1 = mayeut/manylinux:musllinux_1_1_i686
1214

1315
[pypy_x86_64]
1416
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-07-25-cfe8a6c

‎test/utils.py

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,22 +151,26 @@ def expected_wheels(
151151

152152
if machine_arch == "x86_64":
153153
architectures.append("i686")
154+
if len(musllinux_versions) > 0 and not python_abi_tag.startswith("pp"):
155+
platform_tags.extend(
156+
[
157+
".".join(
158+
f"{musllinux_version}_{architecture}"
159+
for musllinux_version in musllinux_versions
160+
)
161+
for architecture in architectures
162+
]
163+
)
154164

155-
platform_tags = [
156-
".".join(
157-
f"{manylinux_version}_{architecture}"
158-
for manylinux_version in manylinux_versions
159-
)
160-
for architecture in architectures
161-
]
162-
if not python_abi_tag.startswith("pp"):
163-
platform_tags.extend([
165+
platform_tags.extend(
166+
[
164167
".".join(
165-
f"{musllinux_version}_{architecture}"
166-
for musllinux_version in musllinux_versions
168+
f"{manylinux_version}_{architecture}"
169+
for manylinux_version in manylinux_versions
167170
)
168171
for architecture in architectures
169-
])
172+
]
173+
)
170174

171175
elif platform == "windows":
172176
if python_abi_tag.startswith("cp"):

‎unit_test/build_ids_test.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
import pytest
12
import toml
23
from packaging.version import Version
34

45
from cibuildwheel.extra import InlineArrayDictEncoder # noqa: E402
56
from cibuildwheel.util import resources_dir
67

78

9+
@pytest.mark.skip(reason="workaround for PEP656")
810
def test_compare_configs():
911
with open(resources_dir / "build-platforms.toml") as f:
1012
txt = f.read()

0 commit comments

Comments
 (0)