Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing tests still failing as manylinux1 wheels are also produced by auditwheel

Browse Source
This commit is contained in:
Yannick Jadoul
2019-10-16 00:33:45 +02:00
parent 7cadc6374a
commit 7978247fa7
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/shared/utils.py
+16 -12
View File
@@ -42,28 +42,23 @@ def cibuildwheel_run(project_path, env=None, add_env=None):
) )
def expected_wheels(package_name, package_version, manylinux_version='2010'): def expected_wheels(package_name, package_version, manylinux_versions={'1_x86_64', '2010_x86_64'}):
''' '''
Returns a list of expected wheels from a run of cibuildwheel. Returns a list of expected wheels from a run of cibuildwheel.
''' '''
if platform == 'linux': if platform == 'linux':
if manylinux_version == '2010': templates = []
templates = [ if '1_x86_64' in manylinux_versions:
'{package_name}-{package_version}-cp27-cp27m-manylinux2010_x86_64.whl', templates += [
'{package_name}-{package_version}-cp27-cp27mu-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp34-cp34m-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp35-cp35m-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp36-cp36m-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp37-cp37m-manylinux2010_x86_64.whl',
]
elif manylinux_version == '1':
templates = [
'{package_name}-{package_version}-cp27-cp27m-manylinux1_x86_64.whl', '{package_name}-{package_version}-cp27-cp27m-manylinux1_x86_64.whl',
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_x86_64.whl', '{package_name}-{package_version}-cp27-cp27mu-manylinux1_x86_64.whl',
'{package_name}-{package_version}-cp34-cp34m-manylinux1_x86_64.whl', '{package_name}-{package_version}-cp34-cp34m-manylinux1_x86_64.whl',
'{package_name}-{package_version}-cp35-cp35m-manylinux1_x86_64.whl', '{package_name}-{package_version}-cp35-cp35m-manylinux1_x86_64.whl',
'{package_name}-{package_version}-cp36-cp36m-manylinux1_x86_64.whl', '{package_name}-{package_version}-cp36-cp36m-manylinux1_x86_64.whl',
'{package_name}-{package_version}-cp37-cp37m-manylinux1_x86_64.whl', '{package_name}-{package_version}-cp37-cp37m-manylinux1_x86_64.whl',
]
if '1_i686' in manylinux_versions:
templates += [
'{package_name}-{package_version}-cp27-cp27m-manylinux1_i686.whl', '{package_name}-{package_version}-cp27-cp27m-manylinux1_i686.whl',
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_i686.whl', '{package_name}-{package_version}-cp27-cp27mu-manylinux1_i686.whl',
'{package_name}-{package_version}-cp34-cp34m-manylinux1_i686.whl', '{package_name}-{package_version}-cp34-cp34m-manylinux1_i686.whl',
@@ -71,6 +66,15 @@ def expected_wheels(package_name, package_version, manylinux_version='2010'):
'{package_name}-{package_version}-cp36-cp36m-manylinux1_i686.whl', '{package_name}-{package_version}-cp36-cp36m-manylinux1_i686.whl',
'{package_name}-{package_version}-cp37-cp37m-manylinux1_i686.whl', '{package_name}-{package_version}-cp37-cp37m-manylinux1_i686.whl',
] ]
if '2010_x86_64' in manylinux_versions:
templates += [
'{package_name}-{package_version}-cp27-cp27m-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp27-cp27mu-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp34-cp34m-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp35-cp35m-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp36-cp36m-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp37-cp37m-manylinux2010_x86_64.whl',
]
elif platform == 'windows': elif platform == 'windows':
templates = [ templates = [
'{package_name}-{package_version}-cp27-cp27m-win32.whl', '{package_name}-{package_version}-cp27-cp27m-win32.whl',