Skip to content

Commit fc1dead

Browse files
YannickJadoulYannickJadoul
committed
Adding manylinux2010_i686 image and simplifying tests' utils.expected_wheels()
1 parent c6f1382 commit fc1dead

File tree

5 files changed

+36
-36
lines changed

5 files changed

+36
-36
lines changed

‎cibuildwheel/__main__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,12 @@ def main():
146146
# TODO Add documentation on CIBW_ENVIRONMENT and possibility of AUDITWHEEL_PLAT if not defined by custom manylinux image
147147

148148
manylinux_x86_64_image = os.environ.get('CIBW_MANYLINUX_X86_64_IMAGE', 'manylinux2010')
149-
manylinux_i686_image = os.environ.get('CIBW_MANYLINUX_I686_IMAGE', 'manylinux1')
149+
manylinux_i686_image = os.environ.get('CIBW_MANYLINUX_I686_IMAGE', 'manylinux2010')
150150

151151
default_manylinux_images_x86_64 = {'manylinux1': 'quay.io/pypa/manylinux1_x86_64',
152152
'manylinux2010': 'quay.io/pypa/manylinux2010_x86_64'}
153-
default_manylinux_images_i686 = {'manylinux1': 'quay.io/pypa/manylinux1_i686'}
153+
default_manylinux_images_i686 = {'manylinux1': 'quay.io/pypa/manylinux1_i686',
154+
'manylinux2010': 'quay.io/pypa/manylinux2010_i686'}
154155

155156
build_options.update(
156157
manylinux_images={'x86_64': default_manylinux_images_x86_64.get(manylinux_x86_64_image) or manylinux_x86_64_image,

‎test/01_basic/cibuildwheel_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ def test_build_identifiers():
2020
# after adding CIBW_MANYLINUX_IMAGE to support manylinux2010, there
2121
# can be multiple wheels for each wheel, though, so we need to limit
2222
# the expected wheels
23-
expected_wheels = utils.expected_wheels('spam', '0.1.0', manylinux_x86_64_versions={'manylinux2010'}, manylinux_i686_versions={'manylinux1'})
23+
expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
24+
if not '-manylinux' in w or '-manylinux1' in w]
2425
build_identifiers = utils.cibuildwheel_get_build_identifiers(project_dir)
2526
assert len(expected_wheels) == len(build_identifiers)

‎test/06_docker_images/cibuildwheel_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def test():
1515
})
1616

1717
# also check that we got the right wheels built
18-
expected_wheels = utils.expected_wheels('spam', '0.1.0')
18+
expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
19+
if '-manylinux2010_i686' not in w]
1920
actual_wheels = os.listdir('wheelhouse')
2021
assert set(actual_wheels) == set(expected_wheels)

‎test/08_manylinux2010_only/cibuildwheel_test.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ def test():
1212
# rather than when dynamically loading the Python
1313
utils.cibuildwheel_run(project_dir, add_env={
1414
'CIBW_ENVIRONMENT': 'CFLAGS="$CFLAGS -Werror=implicit-function-declaration"',
15-
'CIBW_SKIP': '*-manylinux_i686',
1615
})
1716

1817
# also check that we got the right wheels
19-
expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0', manylinux_x86_64_versions={'manylinux2010'})
20-
if '-manylinux1_i686' not in w]
18+
expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
19+
if not '-manylinux' in w or '-manylinux3010' in w]
2120
actual_wheels = os.listdir('wheelhouse')
2221
assert set(actual_wheels) == set(expected_wheels)

‎test/shared/utils.py

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -42,39 +42,37 @@ def cibuildwheel_run(project_path, env=None, add_env=None):
4242
)
4343

4444

45-
def expected_wheels(package_name, package_version, manylinux_x86_64_versions={'manylinux1', 'manylinux2010'}, manylinux_i686_versions={'manylinux1'}):
45+
def expected_wheels(package_name, package_version):
4646
'''
4747
Returns a list of expected wheels from a run of cibuildwheel.
4848
'''
4949
if platform == 'linux':
50-
templates = []
51-
if 'manylinux1' in manylinux_x86_64_versions:
52-
templates += [
53-
'{package_name}-{package_version}-cp27-cp27m-manylinux1_x86_64.whl',
54-
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_x86_64.whl',
55-
'{package_name}-{package_version}-cp34-cp34m-manylinux1_x86_64.whl',
56-
'{package_name}-{package_version}-cp35-cp35m-manylinux1_x86_64.whl',
57-
'{package_name}-{package_version}-cp36-cp36m-manylinux1_x86_64.whl',
58-
'{package_name}-{package_version}-cp37-cp37m-manylinux1_x86_64.whl',
59-
]
60-
if 'manylinux2010' in manylinux_x86_64_versions:
61-
templates += [
62-
'{package_name}-{package_version}-cp27-cp27m-manylinux2010_x86_64.whl',
63-
'{package_name}-{package_version}-cp27-cp27mu-manylinux2010_x86_64.whl',
64-
'{package_name}-{package_version}-cp34-cp34m-manylinux2010_x86_64.whl',
65-
'{package_name}-{package_version}-cp35-cp35m-manylinux2010_x86_64.whl',
66-
'{package_name}-{package_version}-cp36-cp36m-manylinux2010_x86_64.whl',
67-
'{package_name}-{package_version}-cp37-cp37m-manylinux2010_x86_64.whl',
68-
]
69-
if 'manylinux1' in manylinux_i686_versions:
70-
templates += [
71-
'{package_name}-{package_version}-cp27-cp27m-manylinux1_i686.whl',
72-
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_i686.whl',
73-
'{package_name}-{package_version}-cp34-cp34m-manylinux1_i686.whl',
74-
'{package_name}-{package_version}-cp35-cp35m-manylinux1_i686.whl',
75-
'{package_name}-{package_version}-cp36-cp36m-manylinux1_i686.whl',
76-
'{package_name}-{package_version}-cp37-cp37m-manylinux1_i686.whl',
77-
]
50+
templates = [
51+
'{package_name}-{package_version}-cp27-cp27m-manylinux1_x86_64.whl',
52+
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_x86_64.whl',
53+
'{package_name}-{package_version}-cp34-cp34m-manylinux1_x86_64.whl',
54+
'{package_name}-{package_version}-cp35-cp35m-manylinux1_x86_64.whl',
55+
'{package_name}-{package_version}-cp36-cp36m-manylinux1_x86_64.whl',
56+
'{package_name}-{package_version}-cp37-cp37m-manylinux1_x86_64.whl',
57+
'{package_name}-{package_version}-cp27-cp27m-manylinux2010_x86_64.whl',
58+
'{package_name}-{package_version}-cp27-cp27mu-manylinux2010_x86_64.whl',
59+
'{package_name}-{package_version}-cp34-cp34m-manylinux2010_x86_64.whl',
60+
'{package_name}-{package_version}-cp35-cp35m-manylinux2010_x86_64.whl',
61+
'{package_name}-{package_version}-cp36-cp36m-manylinux2010_x86_64.whl',
62+
'{package_name}-{package_version}-cp37-cp37m-manylinux2010_x86_64.whl',
63+
'{package_name}-{package_version}-cp27-cp27m-manylinux1_i686.whl',
64+
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_i686.whl',
65+
'{package_name}-{package_version}-cp34-cp34m-manylinux1_i686.whl',
66+
'{package_name}-{package_version}-cp35-cp35m-manylinux1_i686.whl',
67+
'{package_name}-{package_version}-cp36-cp36m-manylinux1_i686.whl',
68+
'{package_name}-{package_version}-cp37-cp37m-manylinux1_i686.whl',
69+
'{package_name}-{package_version}-cp27-cp27m-manylinux2010_i686.whl',
70+
'{package_name}-{package_version}-cp27-cp27mu-manylinux2010_i686.whl',
71+
'{package_name}-{package_version}-cp34-cp34m-manylinux2010_i686.whl',
72+
'{package_name}-{package_version}-cp35-cp35m-manylinux2010_i686.whl',
73+
'{package_name}-{package_version}-cp36-cp36m-manylinux2010_i686.whl',
74+
'{package_name}-{package_version}-cp37-cp37m-manylinux2010_i686.whl',
75+
]
7876
elif platform == 'windows':
7977
templates = [
8078
'{package_name}-{package_version}-cp27-cp27m-win32.whl',

0 commit comments

Comments
 (0)