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

Making manylinux1 still the default for manylinux_i686 builds

Browse Source
This commit is contained in:
Yannick Jadoul
2019-10-16 00:35:20 +02:00
parent 1220fbbd4b
commit c6f1382813
6 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/shared/utils.py
+12 -12
View File
@@ -42,13 +42,13 @@ def cibuildwheel_run(project_path, env=None, add_env=None):
)
def expected_wheels(package_name, package_version, manylinux_versions={'manylinux1_x86_64', 'manylinux2010_x86_64'}):
def expected_wheels(package_name, package_version, manylinux_x86_64_versions={'manylinux1', 'manylinux2010'}, manylinux_i686_versions={'manylinux1'}):
'''
Returns a list of expected wheels from a run of cibuildwheel.
'''
if platform == 'linux':
templates = []
if 'manylinux1_x86_64' in manylinux_versions:
if 'manylinux1' in manylinux_x86_64_versions:
templates += [
'{package_name}-{package_version}-cp27-cp27m-manylinux1_x86_64.whl',
'{package_name}-{package_version}-cp27-cp27mu-manylinux1_x86_64.whl',
@@ -57,16 +57,7 @@ def expected_wheels(package_name, package_version, manylinux_versions={'manylinu
'{package_name}-{package_version}-cp36-cp36m-manylinux1_x86_64.whl',
'{package_name}-{package_version}-cp37-cp37m-manylinux1_x86_64.whl',
]
if 'manylinux1_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',
'{package_name}-{package_version}-cp35-cp35m-manylinux1_i686.whl',
'{package_name}-{package_version}-cp36-cp36m-manylinux1_i686.whl',
'{package_name}-{package_version}-cp37-cp37m-manylinux1_i686.whl',
]
if 'manylinux2010_x86_64' in manylinux_versions:
if 'manylinux2010' in manylinux_x86_64_versions:
templates += [
'{package_name}-{package_version}-cp27-cp27m-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp27-cp27mu-manylinux2010_x86_64.whl',
@@ -75,6 +66,15 @@ def expected_wheels(package_name, package_version, manylinux_versions={'manylinu
'{package_name}-{package_version}-cp36-cp36m-manylinux2010_x86_64.whl',
'{package_name}-{package_version}-cp37-cp37m-manylinux2010_x86_64.whl',
]
if 'manylinux1' in manylinux_i686_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',
'{package_name}-{package_version}-cp35-cp35m-manylinux1_i686.whl',
'{package_name}-{package_version}-cp36-cp36m-manylinux1_i686.whl',
'{package_name}-{package_version}-cp37-cp37m-manylinux1_i686.whl',
]
elif platform == 'windows':
templates = [
'{package_name}-{package_version}-cp27-cp27m-win32.whl',