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
cibuildwheel/__main__.py
+6 -3
View File
@@ -147,9 +147,12 @@ def main():
manylinux_x86_64_image = os.environ.get('CIBW_MANYLINUX_X86_64_IMAGE', '2010')
manylinux_i686_image = os.environ.get('CIBW_MANYLINUX_I686_IMAGE', '')
default_manylinux_images_x86_64 = {'1': 'quay.io/pypa/manylinux1_x86_64',
'2010': 'quay.io/pypa/manylinux2010_x86_64'}
default_manylinux_images_i686 = {'1': 'quay.io/pypa/manylinux1_i686'}
manylinux_x86_64_image = os.environ.get('CIBW_MANYLINUX_X86_64_IMAGE', 'manylinux2010')
manylinux_i686_image = os.environ.get('CIBW_MANYLINUX_I686_IMAGE', '')
default_manylinux_images_x86_64 = {'manylinux1': 'quay.io/pypa/manylinux1_x86_64',
'manylinux2010': 'quay.io/pypa/manylinux2010_x86_64'}
default_manylinux_images_i686 = {'manylinux1': 'quay.io/pypa/manylinux1_i686'}
build_options.update(
manylinux_images={'x86_64': default_manylinux_images_x86_64.get(manylinux_x86_64_image) or manylinux_x86_64_image,
cibuildwheel/linux.py
+5
View File
@@ -102,6 +102,11 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
echo "Running tests using `which python`"
# Install the wheel we just built
# Note: If auditwheel produced two wheels, it's because the earlier produced wheel
# conforms to multiple manylinux standards. These multiple versions of the wheel are
# functionally the same, differing only in name, wheel metadata, and possibly include
# different external shared libraries. so it doesn't matter which one we run the tests on.
# Let's just pick the first one.
pip install "${{delocated_wheels[0]}}"{test_extras}
# Install any requirements to run the tests