Skip to content

Commit d171b6e

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

File tree

1 file changed

+25
-15
lines changed

1 file changed

+25
-15
lines changed

test/shared/utils.py

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,35 @@ 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_version='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+
if manylinux_version == '2010':
51+
templates = [
52+
'{package_name}-{package_version}-cp27-cp27m-manylinux2010_x86_64.whl',
53+
'{package_name}-{package_version}-cp27-cp27mu-manylinux2010_x86_64.whl',
54+
'{package_name}-{package_version}-cp34-cp34m-manylinux2010_x86_64.whl',
55+
'{package_name}-{package_version}-cp35-cp35m-manylinux2010_x86_64.whl',
56+
'{package_name}-{package_version}-cp36-cp36m-manylinux2010_x86_64.whl',
57+
'{package_name}-{package_version}-cp37-cp37m-manylinux2010_x86_64.whl',
58+
]
59+
elif manylinux_version == '1':
60+
templates = [
61+
'{package_name}-{package_version}-cp27-cp27m-manylinux1_x86_64.whl',
62+
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_x86_64.whl',
63+
'{package_name}-{package_version}-cp34-cp34m-manylinux1_x86_64.whl',
64+
'{package_name}-{package_version}-cp35-cp35m-manylinux1_x86_64.whl',
65+
'{package_name}-{package_version}-cp36-cp36m-manylinux1_x86_64.whl',
66+
'{package_name}-{package_version}-cp37-cp37m-manylinux1_x86_64.whl',
67+
'{package_name}-{package_version}-cp27-cp27m-manylinux1_i686.whl',
68+
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_i686.whl',
69+
'{package_name}-{package_version}-cp34-cp34m-manylinux1_i686.whl',
70+
'{package_name}-{package_version}-cp35-cp35m-manylinux1_i686.whl',
71+
'{package_name}-{package_version}-cp36-cp36m-manylinux1_i686.whl',
72+
'{package_name}-{package_version}-cp37-cp37m-manylinux1_i686.whl',
73+
]
6474
elif platform == 'windows':
6575
templates = [
6676
'{package_name}-{package_version}-cp27-cp27m-win32.whl',

0 commit comments

Comments
 (0)