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

Updated preset values for CIBW_MANYLINUX_*_IMAGE, fixed skip message in 08_manylinux2010_only test, and added clarifying comment on multiple wheels in Linux bash script

Browse Source
This commit is contained in:
Yannick Jadoul
2019-10-16 00:35:20 +02:00
parent 4536b23a1d
commit 179148b0e5
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/06_docker_images/cibuildwheel_test.py
+2 -2
View File
@@ -5,7 +5,7 @@ def test():
project_dir = os.path.dirname(__file__)
if utils.platform != 'linux':
pytest.skip('the docker test is only relevant to the linux build')
pytest.skip('the test is only relevant to the linux build')
utils.cibuildwheel_run(project_dir, add_env={
'CIBW_MANYLINUX_X86_64_IMAGE': 'dockcross/manylinux2010-x64',
@@ -15,6 +15,6 @@ def test():
})
# also check that we got the right wheels built
expected_wheels = utils.expected_wheels('spam', '0.1.0', manylinux_versions={'1_x86_64', '2010_x86_64', '1_i686'})
expected_wheels = utils.expected_wheels('spam', '0.1.0', manylinux_versions={'manylinux1_x86_64', 'manylinux2010_x86_64', 'manylinux1_i686'})
actual_wheels = os.listdir('wheelhouse')
assert set(actual_wheels) == set(expected_wheels)
test/08_manylinux2010_only/cibuildwheel_test.py
+1 -1
View File
@@ -15,6 +15,6 @@ def test():
})
# also check that we got the right wheels
expected_wheels = utils.expected_wheels('spam', '0.1.0', manylinux_versions={'2010_x86_64'})
expected_wheels = utils.expected_wheels('spam', '0.1.0', manylinux_versions={'manylinux2010_x86_64'})
actual_wheels = os.listdir('wheelhouse')
assert set(actual_wheels) == set(expected_wheels)
test/shared/utils.py
+4 -4
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={'1_x86_64', '2010_x86_64'}):
def expected_wheels(package_name, package_version, manylinux_versions={'manylinux1_x86_64', 'manylinux2010_x86_64'}):
'''
Returns a list of expected wheels from a run of cibuildwheel.
'''
if platform == 'linux':
templates = []
if '1_x86_64' in manylinux_versions:
if 'manylinux1_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',
@@ -57,7 +57,7 @@ def expected_wheels(package_name, package_version, manylinux_versions={'1_x86_64
'{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:
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',
@@ -66,7 +66,7 @@ def expected_wheels(package_name, package_version, manylinux_versions={'1_x86_64
'{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:
if 'manylinux2010_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',