Skip to content

Commit 0908322

Browse files
committed
Fixing tests failing because of new manylinux2010 default
1 parent 52a506d commit 0908322

File tree

1 file changed

+26
-15
lines changed

1 file changed

+26
-15
lines changed

test/shared/utils.py

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,36 @@ def cibuildwheel_run(project_path, env=None, add_env=None):
4242
)
4343

4444

45-
def expected_wheels(package_name, package_version):
45+
def expected_wheels(package_name, package_version, manylinux_versions={'1', '2010'}):
4646
'''
4747
Returns a list of expected wheels from a run of cibuildwheel.
4848
'''
4949
if platform == 'linux':
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-manylinux1_i686.whl',
58-
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_i686.whl',
59-
'{package_name}-{package_version}-cp34-cp34m-manylinux1_i686.whl',
60-
'{package_name}-{package_version}-cp35-cp35m-manylinux1_i686.whl',
61-
'{package_name}-{package_version}-cp36-cp36m-manylinux1_i686.whl',
62-
'{package_name}-{package_version}-cp37-cp37m-manylinux1_i686.whl',
63-
]
50+
templates = []
51+
if '1' in manylinux_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+
'{package_name}-{package_version}-cp27-cp27m-manylinux1_i686.whl',
60+
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_i686.whl',
61+
'{package_name}-{package_version}-cp34-cp34m-manylinux1_i686.whl',
62+
'{package_name}-{package_version}-cp35-cp35m-manylinux1_i686.whl',
63+
'{package_name}-{package_version}-cp36-cp36m-manylinux1_i686.whl',
64+
'{package_name}-{package_version}-cp37-cp37m-manylinux1_i686.whl',
65+
]
66+
elif '2010' in manylinux_versions:
67+
templates += [
68+
'{package_name}-{package_version}-cp27-cp27m-manylinux2010_x86_64.whl',
69+
'{package_name}-{package_version}-cp27-cp27mu-manylinux2010_x86_64.whl',
70+
'{package_name}-{package_version}-cp34-cp34m-manylinux2010_x86_64.whl',
71+
'{package_name}-{package_version}-cp35-cp35m-manylinux2010_x86_64.whl',
72+
'{package_name}-{package_version}-cp36-cp36m-manylinux2010_x86_64.whl',
73+
'{package_name}-{package_version}-cp37-cp37m-manylinux2010_x86_64.whl',
74+
]
6475
elif platform == 'windows':
6576
templates = [
6677
'{package_name}-{package_version}-cp27-cp27m-win32.whl',

0 commit comments

Comments
 (0)