Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit dd3e7d9

Browse filesBrowse files
mattipmattip
authored
Merge pull request #28415 from mayeut/pypy-3.11-wheels
BLD: update cibuildwheel and build PyPy 3.11 wheels [wheel build]
2 parents 7f0ebda + 869280a commit dd3e7d9
Copy full SHA for dd3e7d9

File tree

Expand file treeCollapse file tree

5 files changed

+27
-32
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+27
-32
lines changed

‎.github/workflows/linux.yml

Copy file name to clipboardExpand all lines: .github/workflows/linux.yml
+18-19Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,24 @@ jobs:
7878
pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
7979
- uses: ./.github/meson_actions
8080

81-
# TODO pypy: uncomment when pypy3.11 becomes available
82-
#pypy:
83-
#needs: [smoke_test]
84-
#runs-on: ubuntu-latest
85-
#if: github.event_name != 'push'
86-
#steps:
87-
#- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
88-
#with:
89-
#submodules: recursive
90-
#fetch-tags: true
91-
#persist-credentials: false
92-
#- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
93-
#with:
94-
#python-version: 'pypy3.10-v7.3.17'
95-
#- name: Setup using scipy-openblas
96-
#run: |
97-
#python -m pip install -r requirements/ci_requirements.txt
98-
#spin config-openblas --with-scipy-openblas=32
99-
#- uses: ./.github/meson_actions
81+
pypy:
82+
needs: [smoke_test]
83+
runs-on: ubuntu-latest
84+
if: github.event_name != 'push'
85+
steps:
86+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
87+
with:
88+
submodules: recursive
89+
fetch-tags: true
90+
persist-credentials: false
91+
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
92+
with:
93+
python-version: 'pypy3.11-v7.3.19'
94+
- name: Setup using scipy-openblas
95+
run: |
96+
python -m pip install -r requirements/ci_requirements.txt
97+
spin config-openblas --with-scipy-openblas=32
98+
- uses: ./.github/meson_actions
10099

101100
debug:
102101
needs: [smoke_test]

‎.github/workflows/wheels.yml

Copy file name to clipboardExpand all lines: .github/workflows/wheels.yml
+6-10Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,16 @@ jobs:
9191
- [macos-14, macosx_arm64, accelerate] # always use accelerate
9292
- [windows-2019, win_amd64, ""]
9393
- [windows-2019, win32, ""]
94-
# TODO pypy: Add pp311 to this list when it comes out (pp310 removed)
95-
python: ["cp311", "cp312", "cp313", "cp313t"]
94+
python: ["cp311", "cp312", "cp313", "cp313t", "pp311"]
9695
exclude:
9796
# Don't build PyPy 32-bit windows
9897
- buildplat: [windows-2019, win32, ""]
99-
python: "pp310"
98+
python: "pp311"
99+
# No PyPy on musllinux images
100100
- buildplat: [ ubuntu-22.04, musllinux_x86_64, "" ]
101-
python: "pp310"
101+
python: "pp311"
102102
- buildplat: [ ubuntu-22.04-arm, musllinux_aarch64, "" ]
103-
python: "pp310"
104-
- buildplat: [ macos-14, macosx_arm64, accelerate ]
105-
python: "pp310"
103+
python: "pp311"
106104
- buildplat: [ macos13, macosx_x86_64, openblas ]
107105
python: "cp313t"
108106

@@ -173,10 +171,8 @@ jobs:
173171
echo "CIBW_BUILD_FRONTEND=pip; args: --no-build-isolation" >> "$GITHUB_ENV"
174172
175173
- name: Build wheels
176-
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
174+
uses: pypa/cibuildwheel@6cccd09a31908ffd175b012fb8bf4e1dbda3bc6c # v2.23.0
177175
env:
178-
CIBW_PRERELEASE_PYTHONS: True
179-
CIBW_FREE_THREADED_SUPPORT: True
180176
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
181177

182178
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0

‎azure-pipelines.yml

Copy file name to clipboardExpand all lines: azure-pipelines.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ stages:
9090
BITS: 64
9191
_USE_BLAS_ILP64: '1'
9292
# TODO pypy: uncomment when pypy3.11 comes out
93-
# PyPy310-64bit-fast:
94-
# PYTHON_VERSION: 'pypy3.10'
93+
# PyPy311-64bit-fast:
94+
# PYTHON_VERSION: 'pypy3.11'
9595
# PYTHON_ARCH: 'x64'
9696
# TEST_MODE: fast
9797
# BITS: 64

‎pyproject.toml

Copy file name to clipboardExpand all lines: pyproject.toml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
148148
config-settings = "setup-args=-Duse-ilp64=true setup-args=-Dallow-noblas=false build-dir=build"
149149
before-test = "pip install -r {project}/requirements/test_requirements.txt"
150150
test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
151+
enable = ["cpython-freethreading", "pypy", "cpython-prerelease"]
151152

152153
[tool.cibuildwheel.linux]
153154
manylinux-x86_64-image = "manylinux2014"

‎tools/ci/cirrus_wheels.yml

Copy file name to clipboardExpand all lines: tools/ci/cirrus_wheels.yml
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ macosx_arm64_task:
2020
CIBW_BUILD: cp313-*
2121
- env:
2222
CIBW_BUILD: cp313t-*
23-
CIBW_FREE_THREADED_SUPPORT: 1
2423
CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation"
2524
env:
2625
PATH: /usr/local/lib:/usr/local/include:$PATH

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.