Skip to content

Commit 397b7a8

Browse files
authored
Merge pull request numpy#27707 from ngoldbaum/update-free-threaded-ci
CI: Set up free-threaded CI using quansight-labs/setup-python
2 parents fa111b4 + 1d70eba commit 397b7a8

File tree

2 files changed

+19
-26
lines changed

2 files changed

+19
-26
lines changed

.github/workflows/linux.yml

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,20 @@ jobs:
5555
MESON_ARGS: "-Dallow-noblas=true -Dcpu-baseline=none -Dcpu-dispatch=none"
5656
strategy:
5757
matrix:
58-
version: ["3.10", "3.11", "3.12", "3.13-dev"]
58+
version: ["3.10", "3.11", "3.12", "3.13", "3.13t"]
5959
steps:
6060
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6161
with:
6262
submodules: recursive
6363
fetch-tags: true
64-
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
64+
- uses: quansight-labs/setup-python@b9ab292c751a42bcd2bb465b7fa202ea2c3f5796 # v5.3.1
6565
with:
6666
python-version: ${{ matrix.version }}
67+
# TODO: remove cython nightly install when cython does a release
68+
- name: Install nightly Cython
69+
if: matrix.version == '3.13t'
70+
run: |
71+
pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
6772
- uses: ./.github/meson_actions
6873

6974
pypy:
@@ -291,23 +296,3 @@ jobs:
291296
rm -rf build-install
292297
./vendored-meson/meson/meson.py install -C build --destdir ../build-install --tags=runtime,python-runtime,devel
293298
python tools/check_installed_files.py $(find ./build-install -path '*/site-packages/numpy') --no-tests
294-
295-
free-threaded:
296-
needs: [smoke_test]
297-
runs-on: ubuntu-latest
298-
if: github.event_name != 'push'
299-
steps:
300-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
301-
with:
302-
submodules: recursive
303-
fetch-tags: true
304-
# TODO: replace with setup-python when there is support
305-
- uses: deadsnakes/action@e640ac8743173a67cca4d7d77cd837e514bf98e8 # v3.2.0
306-
with:
307-
python-version: '3.13-dev'
308-
nogil: true
309-
# TODO: remove cython nightly install when cython does a release
310-
- name: Install nightly Cython
311-
run: |
312-
pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
313-
- uses: ./.github/meson_actions

.github/workflows/macos.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: macOS tests (meson)
1+
name: macOS tests
22

33
on:
44
pull_request:
@@ -103,7 +103,8 @@ jobs:
103103
104104
105105
accelerate:
106-
name: Accelerate (LP64, ILP64) - ${{ matrix.build_runner[1] }}
106+
name: Accelerate - ${{ matrix.build_runner[1] }} - ${{ matrix.version }}
107+
# To enable this workflow on a fork, comment out:
107108
if: github.repository == 'numpy/numpy'
108109
runs-on: ${{ matrix.build_runner[0] }}
109110
strategy:
@@ -112,22 +113,29 @@ jobs:
112113
build_runner:
113114
- [ macos-13, "macos_x86_64" ]
114115
- [ macos-14, "macos_arm64" ]
116+
version: ["3.10", "3.13t"]
115117

116118
steps:
117119
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
118120
with:
119121
submodules: recursive
120122
fetch-tags: true
121123

122-
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
124+
- uses: quansight-labs/setup-python@b9ab292c751a42bcd2bb465b7fa202ea2c3f5796 # v5.3.1
123125
with:
124-
python-version: '3.10'
126+
python-version: ${{ matrix.version }}
125127

126128
- uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
127129
if: ${{ matrix.build_runner[0] == 'macos-13' }}
128130
with:
129131
xcode-version: '14.3'
130132

133+
# TODO: remove cython nightly install when cython does a release
134+
- name: Install nightly Cython
135+
if: matrix.version == '3.13t'
136+
run: |
137+
pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
138+
131139
- name: Install dependencies
132140
run: |
133141
pip install -r requirements/build_requirements.txt

0 commit comments

Comments
 (0)