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

Trying out PyPy 7.3.0rc3 on manylinux2010 as well, with a temporary newer version of manylinux2010-pypy_x86_64 image

Browse Source
This commit is contained in:
Yannick Jadoul
2020-02-15 23:24:51 +01:00
parent 08d3ee1d91
commit 4c718706c8
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/__main__.py
+2 -1
View File
@@ -167,7 +167,8 @@ def main():
default_manylinux_images_i686 = {'manylinux1': 'quay.io/pypa/manylinux1_i686', default_manylinux_images_i686 = {'manylinux1': 'quay.io/pypa/manylinux1_i686',
'manylinux2010': 'quay.io/pypa/manylinux2010_i686', 'manylinux2010': 'quay.io/pypa/manylinux2010_i686',
'manylinux2014': 'quay.io/pypa/manylinux2014_i686'} 'manylinux2014': 'quay.io/pypa/manylinux2014_i686'}
default_manylinux_images_pypy_x86_64 = {'manylinux2010': 'pypywheels/manylinux2010-pypy_x86_64'} # Testing 7.3.0rc3. Before merging PR, reset to 'pypywheels/manylinux2010-pypy_x86_64'!
default_manylinux_images_pypy_x86_64 = {'manylinux2010': 'yannickjadoul/manylinux2010-pypy_x86_64:7.3.0rc3'}
build_options.update( build_options.update(
manylinux_images={'x86_64': default_manylinux_images_x86_64.get(manylinux_x86_64_image) or manylinux_x86_64_image, manylinux_images={'x86_64': default_manylinux_images_x86_64.get(manylinux_x86_64_image) or manylinux_x86_64_image,
cibuildwheel/linux.py
+2 -2
View File
@@ -27,8 +27,8 @@ def get_python_configurations(build_selector):
PythonConfiguration(identifier='cp36-manylinux_i686', path='/opt/python/cp36-cp36m'), PythonConfiguration(identifier='cp36-manylinux_i686', path='/opt/python/cp36-cp36m'),
PythonConfiguration(identifier='cp37-manylinux_i686', path='/opt/python/cp37-cp37m'), PythonConfiguration(identifier='cp37-manylinux_i686', path='/opt/python/cp37-cp37m'),
PythonConfiguration(identifier='cp38-manylinux_i686', path='/opt/python/cp38-cp38'), PythonConfiguration(identifier='cp38-manylinux_i686', path='/opt/python/cp38-cp38'),
PythonConfiguration(identifier='pp27_72-manylinux_pypy_x86_64', path='/opt/python/pp272-pypy_41'), PythonConfiguration(identifier='pp27_73-manylinux_pypy_x86_64', path='/opt/python/pp273-pypy_73'),
PythonConfiguration(identifier='pp36_72-manylinux_pypy_x86_64', path='/opt/python/pp372-pypy3_72'), PythonConfiguration(identifier='pp36_73-manylinux_pypy_x86_64', path='/opt/python/pp373-pypy36_pp73'),
] ]
# skip builds as required # skip builds as required
test/shared/utils.py
-3
View File
@@ -83,9 +83,6 @@ def expected_wheels(package_name, package_version, manylinux_versions=['manylinu
'pp273-pypy_73', 'pp373-pypy36_pp73'] 'pp273-pypy_73', 'pp373-pypy36_pp73']
if platform == 'linux': if platform == 'linux':
python_abi_tags.append('cp27-cp27mu') # python 2.7 has 2 different ABI on manylinux python_abi_tags.append('cp27-cp27mu') # python 2.7 has 2 different ABI on manylinux
# We don't have PyPy 7.3.0rc1 yet on the manylinux image
python_abi_tags[python_abi_tags.index('pp273-pypy_73')] = 'pp272-pypy_41'
python_abi_tags[python_abi_tags.index('pp373-pypy36_pp73')] = 'pp372-pypy3_72'
architectures = {'cp': ['x86_64', 'i686'], 'pp': ['x86_64']} architectures = {'cp': ['x86_64', 'i686'], 'pp': ['x86_64']}
platform_tags = {} platform_tags = {}
for python_implemention in architectures: for python_implemention in architectures: