From 7978247fa722def160641fb82aec745a1e769e69 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Sat, 17 Aug 2019 23:43:30 +0200 Subject: [PATCH] Fixing tests still failing as manylinux1 wheels are also produced by auditwheel --- test/shared/utils.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/test/shared/utils.py b/test/shared/utils.py index 2fa3db1f..63f4c557 100644 --- a/test/shared/utils.py +++ b/test/shared/utils.py @@ -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. ''' if platform == 'linux': - if manylinux_version == '2010': - 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 manylinux_version == '1': - templates = [ + templates = [] + if '1_x86_64' in manylinux_versions: + templates += [ '{package_name}-{package_version}-cp27-cp27m-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}-cp35-cp35m-manylinux1_x86_64.whl', '{package_name}-{package_version}-cp36-cp36m-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-cp27mu-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}-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': templates = [ '{package_name}-{package_version}-cp27-cp27m-win32.whl',