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

Merge pull request #430 from YannickJadoul/pypy-7.3.2

Browse Source 
[READY] Updating PyPy to 7.3.2
This commit is contained in:
Yannick Jadoul
2020-10-06 17:47:34 +02:00
committed by GitHub
parent 630653b786 0154a8f992
commit 015f382418
14 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circleci/config.yml
+1 -1
View File
@@ -3,7 +3,7 @@ version: 2
jobs: jobs:
osx-python3.6: osx-python3.6:
macos: macos:
xcode: "9.4.1" xcode: 10.2.1
environment: environment:
PYTHON: python3 PYTHON: python3
steps: steps:
.travis.yml
+5 -2
View File
@@ -28,7 +28,10 @@ jobs:
- name: macOS | x86_64 | Python 3.x - name: macOS | x86_64 | Python 3.x
os: osx os: osx
env: PYTHON=python3 osx_image: xcode10.2
env:
- PYTHON=python3
- PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code'
- name: Windows | x86_64 | Python 3.6 - name: Windows | x86_64 | Python 3.6
os: windows os: windows
@@ -52,6 +55,6 @@ jobs:
# must repeat the s390x job above exactly to match # must repeat the s390x job above exactly to match
- *linux_s390x_36 - *linux_s390x_36
install: $PYTHON -m pip install -r requirements-dev.txt install: $PYTHON -m pip install -r requirements-dev.txt pytest-custom-exit-code
script: $PYTHON ./bin/run_tests.py script: $PYTHON ./bin/run_tests.py
README.md
+5 -2
View File
@@ -23,8 +23,9 @@ What does it do?
| CPython 3.7 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ | | CPython 3.7 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ |
| CPython 3.8 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ | | CPython 3.8 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ |
| CPython 3.9 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ | | CPython 3.9 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ |
| PyPy 2.7 v7.3.0 | ✅ | | ✅ | ✅ | | | | | | PyPy 2.7 v7.3.2 | ✅ | | ✅ | ✅ | | | | |
| PyPy 3.6 v7.3.0 | ✅ | | ✅ | ✅ | | | | | | PyPy 3.6 v7.3.2 | ✅ | | ✅ | ✅ | | | | |
| PyPy 3.7 (alpha) v7.3.2 | ✅ | | ✅ | ✅ | | | | |
<sup>¹ Not supported on Travis</sup><br> <sup>¹ Not supported on Travis</sup><br>
<sup>² Only supported on Travis</sup><br> <sup>² Only supported on Travis</sup><br>
@@ -66,6 +67,8 @@ jobs:
- services: docker - services: docker
# and a mac build # and a mac build
- os: osx - os: osx
# PyPy 7.3.2 needs macOS >= 10.14
osx_image: xcode10.2
language: shell language: shell
# and a windows build # and a windows build
- os: windows - os: windows
appveyor.yml
+1 -9
View File
@@ -1,7 +1,4 @@
environment: environment:
# workaround an appveyor bug on macos
# see https://github.com/appveyor/ci/issues/3376#issuecomment-611314299
APPVEYOR_CONSOLE_DISABLE_PTY: true
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
APPVEYOR_JOB_NAME: "python37-x64-ubuntu" APPVEYOR_JOB_NAME: "python37-x64-ubuntu"
@@ -10,11 +7,6 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: macos-mojave - APPVEYOR_BUILD_WORKER_IMAGE: macos-mojave
APPVEYOR_JOB_NAME: "python37-x64-macos-mojave" APPVEYOR_JOB_NAME: "python37-x64-macos-mojave"
# while pypy libffi dependency is failing the build, allow failures on macos
matrix:
allow_failures:
- APPVEYOR_BUILD_WORKER_IMAGE: macos-mojave
stack: python 3.7 stack: python 3.7
build: off build: off
@@ -24,7 +16,7 @@ init:
- ps: | - ps: |
$BRANCH = if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) { $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH } else { $env:APPVEYOR_REPO_BRANCH } $BRANCH = if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) { $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH } else { $env:APPVEYOR_REPO_BRANCH }
if (-not ($BRANCH -eq 'master' -or $BRANCH.ToLower().StartsWith('appveyor-'))) { if (-not ($BRANCH -eq 'master' -or $BRANCH.ToLower().StartsWith('appveyor-'))) {
$env:PYTEST_ADDOPTS='-k "unit_test or _basic" --suppress-no-test-exit-code' $env:PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code'
} }
install: python -m pip install -r requirements-dev.txt pytest-custom-exit-code install: python -m pip install -r requirements-dev.txt pytest-custom-exit-code
cibuildwheel/linux.py
+1
View File
@@ -60,6 +60,7 @@ def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfi
PythonConfiguration(version='3.9', identifier='cp39-manylinux_i686', path_str='/opt/python/cp39-cp39'), PythonConfiguration(version='3.9', identifier='cp39-manylinux_i686', path_str='/opt/python/cp39-cp39'),
PythonConfiguration(version='2.7', identifier='pp27-manylinux_x86_64', path_str='/opt/python/pp27-pypy_73'), PythonConfiguration(version='2.7', identifier='pp27-manylinux_x86_64', path_str='/opt/python/pp27-pypy_73'),
PythonConfiguration(version='3.6', identifier='pp36-manylinux_x86_64', path_str='/opt/python/pp36-pypy36_pp73'), PythonConfiguration(version='3.6', identifier='pp36-manylinux_x86_64', path_str='/opt/python/pp36-pypy36_pp73'),
PythonConfiguration(version='3.7', identifier='pp37-manylinux_x86_64', path_str='/opt/python/pp37-pypy37_pp73'),
PythonConfiguration(version='3.5', identifier='cp35-manylinux_aarch64', path_str='/opt/python/cp35-cp35m'), PythonConfiguration(version='3.5', identifier='cp35-manylinux_aarch64', path_str='/opt/python/cp35-cp35m'),
PythonConfiguration(version='3.6', identifier='cp36-manylinux_aarch64', path_str='/opt/python/cp36-cp36m'), PythonConfiguration(version='3.6', identifier='cp36-manylinux_aarch64', path_str='/opt/python/cp36-cp36m'),
PythonConfiguration(version='3.7', identifier='cp37-manylinux_aarch64', path_str='/opt/python/cp37-cp37m'), PythonConfiguration(version='3.7', identifier='cp37-manylinux_aarch64', path_str='/opt/python/cp37-cp37m'),
cibuildwheel/macos.py
+3 -2
View File
@@ -40,8 +40,9 @@ def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfi
PythonConfiguration(version='3.8', identifier='cp38-macosx_x86_64', url='https://www.python.org/ftp/python/3.8.4/python-3.8.4-macosx10.9.pkg'), PythonConfiguration(version='3.8', identifier='cp38-macosx_x86_64', url='https://www.python.org/ftp/python/3.8.4/python-3.8.4-macosx10.9.pkg'),
PythonConfiguration(version='3.9', identifier='cp39-macosx_x86_64', url='https://www.python.org/ftp/python/3.9.0/python-3.9.0rc1-macosx10.9.pkg'), PythonConfiguration(version='3.9', identifier='cp39-macosx_x86_64', url='https://www.python.org/ftp/python/3.9.0/python-3.9.0rc1-macosx10.9.pkg'),
# PyPy # PyPy
PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.1-osx64.tar.bz2'), PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2-osx64.tar.bz2'),
PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.1-osx64.tar.bz2'), PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2-osx64.tar.bz2'),
PythonConfiguration(version='3.7', identifier='pp37-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2-osx64.tar.bz2'),
] ]
# skip builds as required # skip builds as required
cibuildwheel/resources/pinned_docker_images.cfg
+10 -10
View File
@@ -1,22 +1,22 @@
[x86_64] [x86_64]
manylinux1 = quay.io/pypa/manylinux1_x86_64:2020-09-20-9444d5c manylinux1 = quay.io/pypa/manylinux1_x86_64:2020-09-26-9f151ab
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2020-09-20-6131e60 manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2020-09-26-58cbbcd
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2020-09-20-fb9af88 manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2020-09-26-7f7a14f
[i686] [i686]
manylinux1 = quay.io/pypa/manylinux1_i686:2020-09-20-9444d5c manylinux1 = quay.io/pypa/manylinux1_i686:2020-09-26-9f151ab
manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-09-20-6131e60 manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-09-26-58cbbcd
manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-09-20-fb9af88 manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-09-26-7f7a14f
[pypy_x86_64] [pypy_x86_64]
manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-07-02-fd8c128 manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-09-26-8f210b5
[aarch64] [aarch64]
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-09-20-fb9af88 manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-09-26-7f7a14f
[ppc64le] [ppc64le]
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2020-09-20-fb9af88 manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2020-09-26-7f7a14f
[s390x] [s390x]
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2020-09-20-fb9af88 manylinux2014 = quay.io/pypa/manylinux2014_s390x:2020-09-26-7f7a14f
cibuildwheel/windows.py
+3 -2
View File
@@ -61,8 +61,9 @@ def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfi
PythonConfiguration(version='3.9.0-rc1', arch='32', identifier='cp39-win32', url=None), PythonConfiguration(version='3.9.0-rc1', arch='32', identifier='cp39-win32', url=None),
PythonConfiguration(version='3.9.0-rc1', arch='64', identifier='cp39-win_amd64', url=None), PythonConfiguration(version='3.9.0-rc1', arch='64', identifier='cp39-win_amd64', url=None),
# PyPy # PyPy
PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.1-win32.zip'), PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2-win32.zip'),
PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.1-win32.zip'), PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2-win32.zip'),
PythonConfiguration(version='3.7', arch='32', identifier='pp37-win32', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2-win32.zip'),
] ]
if IS_RUNNING_ON_TRAVIS: if IS_RUNNING_ON_TRAVIS:
docs/options.md
+5 -3
View File
@@ -86,13 +86,15 @@ When setting the options, you can use shell-style globbing syntax (as per [`fnma
| Python 3.6 | cp36-macosx_x86_64 | cp36-manylinux_x86_64 | cp36-manylinux_i686 | cp36-win_amd64 | cp36-win32 | cp36-manylinux_aarch64 | cp36-manylinux_ppc64le | cp36-manylinux_s390x | | Python 3.6 | cp36-macosx_x86_64 | cp36-manylinux_x86_64 | cp36-manylinux_i686 | cp36-win_amd64 | cp36-win32 | cp36-manylinux_aarch64 | cp36-manylinux_ppc64le | cp36-manylinux_s390x |
| Python 3.7 | cp37-macosx_x86_64 | cp37-manylinux_x86_64 | cp37-manylinux_i686 | cp37-win_amd64 | cp37-win32 | cp37-manylinux_aarch64 | cp37-manylinux_ppc64le | cp37-manylinux_s390x | | Python 3.7 | cp37-macosx_x86_64 | cp37-manylinux_x86_64 | cp37-manylinux_i686 | cp37-win_amd64 | cp37-win32 | cp37-manylinux_aarch64 | cp37-manylinux_ppc64le | cp37-manylinux_s390x |
| Python 3.8 | cp38-macosx_x86_64 | cp38-manylinux_x86_64 | cp38-manylinux_i686 | cp38-win_amd64 | cp38-win32 | cp38-manylinux_aarch64 | cp38-manylinux_ppc64le | cp38-manylinux_s390x | | Python 3.8 | cp38-macosx_x86_64 | cp38-manylinux_x86_64 | cp38-manylinux_i686 | cp38-win_amd64 | cp38-win32 | cp38-manylinux_aarch64 | cp38-manylinux_ppc64le | cp38-manylinux_s390x |
| PyPy 2.7 v7.3.0 | pp27-macosx_x86_64 | pp27-manylinux_x86_64 | | | pp27-win32 | | | | | PyPy 2.7 v7.3.2 | pp27-macosx_x86_64 | pp27-manylinux_x86_64 | | | pp27-win32 | | | |
| PyPy 3.6 v7.3.0 | pp36-macosx_x86_64 | pp36-manylinux_x86_64 | | | pp36-win32 | | | | | PyPy 3.6 v7.3.2 | pp36-macosx_x86_64 | pp36-manylinux_x86_64 | | | pp36-win32 | | | |
| PyPy 3.7 (alpha) v7.3.2 | pp37-macosx_x86_64 | pp37-manylinux_x86_64 | | | pp37-win32 | | | |
The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to `cibuildwheel`. The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to `cibuildwheel`.
The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details). The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details).
For CPython, the minimally supported macOS version is 10.9; for PyPy 2.7 and PyPy 3.6, respectively macOS 10.7 and 10.13 or higher is required. For CPython, the minimally supported macOS version is 10.9; for PyPy 2.7 and PyPy 3.6/3.7, respectively macOS 10.7 and 10.13 or higher is required.
#### Examples #### Examples
examples/circleci-minimal.yml
+2 -1
View File
@@ -19,7 +19,8 @@ jobs:
osx-wheels: osx-wheels:
working_directory: ~/osx-wheels working_directory: ~/osx-wheels
macos: macos:
xcode: "10.0.0" # PyPy 7.3.2 needs macOS >= 10.14
xcode: 10.2.1
steps: steps:
- checkout - checkout
- run: - run:
examples/travis-ci-deploy.yml
+2
View File
@@ -9,6 +9,8 @@ jobs:
- services: docker - services: docker
# and a mac build # and a mac build
- os: osx - os: osx
# PyPy 7.3.2 needs macOS >= 10.14
osx_image: xcode10.2
language: shell language: shell
# and a windows build # and a windows build
- os: windows - os: windows
examples/travis-ci-minimal.yml
+2
View File
@@ -15,6 +15,8 @@ jobs:
arch: s390x arch: s390x
# and a mac build # and a mac build
- os: osx - os: osx
# PyPy 7.3.2 needs macOS >= 10.14
osx_image: xcode10.2
language: shell language: shell
# and a windows build # and a windows build
- os: windows - os: windows
examples/travis-ci-test-and-deploy.yml
+2
View File
@@ -64,6 +64,8 @@ jobs:
- stage: deploy - stage: deploy
name: Build and deploy macOS wheels name: Build and deploy macOS wheels
os: osx os: osx
# PyPy 7.3.2 needs macOS >= 10.14
osx_image: xcode10.2
language: shell language: shell
install: python3 -m pip install cibuildwheel==1.6.1 install: python3 -m pip install cibuildwheel==1.6.1
script: python3 -m cibuildwheel --output-dir wheelhouse script: python3 -m cibuildwheel --output-dir wheelhouse
test/utils.py
+1 -1
View File
@@ -94,7 +94,7 @@ def expected_wheels(package_name, package_version, manylinux_versions=None,
python_abi_tags = ['cp35-cp35m', 'cp36-cp36m', 'cp37-cp37m', 'cp38-cp38', 'cp39-cp39'] python_abi_tags = ['cp35-cp35m', 'cp36-cp36m', 'cp37-cp37m', 'cp38-cp38', 'cp39-cp39']
if pm.machine() in ['x86_64', 'AMD64', 'x86']: if pm.machine() in ['x86_64', 'AMD64', 'x86']:
python_abi_tags += ['cp27-cp27m', 'pp27-pypy_73', 'pp36-pypy36_pp73'] python_abi_tags += ['cp27-cp27m', 'pp27-pypy_73', 'pp36-pypy36_pp73', 'pp37-pypy37_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