Skip to content

Commit ae08bdc

Browse files
authored
block Cython 3.0+ as a build dep (#702)
* keeps libyaml extension build functional once Cython 3.0 releases; stopgap measure until we can rewrite the extension build to eliminate all the ancient deprecated distutils magic
1 parent f873cfe commit ae08bdc

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ jobs:
197197
defaults:
198198
run:
199199
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
200-
runs-on: ${{ matrix.runs_on || 'macos-10.15' }}
200+
runs-on: ${{ matrix.runs_on || 'macos-11' }}
201201
steps:
202202
- name: Check cached libyaml state
203203
id: cached_libyaml
@@ -225,14 +225,15 @@ jobs:
225225
macos_pyyaml:
226226
needs: macos_libyaml
227227
name: pyyaml ${{ matrix.spec }}
228-
runs-on: ${{ matrix.runs_on || 'macos-10.15' }}
228+
runs-on: ${{ matrix.runs_on || 'macos-11' }}
229229
defaults:
230230
run:
231231
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
232232
strategy:
233233
matrix:
234234
include:
235235
- spec: cp36-macosx_x86_64
236+
cibw_version: cibuildwheel==2.11.1
236237
# - spec: cp37-macosx_x86_64
237238
# - spec: cp38-macosx_x86_64
238239
# - spec: cp39-macosx_x86_64
@@ -288,7 +289,7 @@ jobs:
288289
SDKROOT: ${{ matrix.sdkroot || 'macosx' }}
289290
run: |
290291
python3 -V
291-
python3 -m pip install -U --user cibuildwheel
292+
python3 -m pip install -U --user ${{ matrix.cibw_version || 'cibuildwheel' }}
292293
python3 -m cibuildwheel --platform auto --output-dir dist .
293294
294295
- name: Upload artifacts
@@ -369,7 +370,7 @@ jobs:
369370
- platform: windows-2019
370371
build_arch: x64
371372
python_arch: x64
372-
spec: '3.11.0-rc.2'
373+
spec: '3.11'
373374
- platform: windows-2019
374375
build_arch: win32
375376
python_arch: x86
@@ -393,7 +394,7 @@ jobs:
393394
- platform: windows-2019
394395
build_arch: win32
395396
python_arch: x86
396-
spec: '3.11.0-rc.2'
397+
spec: '3.11'
397398
steps:
398399
# autocrlf screws up tests under Windows
399400
- name: Set git to use LF
@@ -429,7 +430,7 @@ jobs:
429430
run: |
430431
set -eux
431432
python -V
432-
python -m pip install Cython wheel
433+
python -m pip install "Cython<3.0" wheel
433434
434435
python setup.py \
435436
--with-libyaml build_ext \

.github/workflows/manual_artifact_build.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ jobs:
195195
defaults:
196196
run:
197197
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
198-
runs-on: ${{ matrix.runs_on || 'macos-10.15' }}
198+
runs-on: ${{ matrix.runs_on || 'macos-11' }}
199199
steps:
200200
- name: Check cached libyaml state
201201
id: cached_libyaml
@@ -223,16 +223,19 @@ jobs:
223223
macos_pyyaml:
224224
needs: macos_libyaml
225225
name: pyyaml ${{ matrix.spec }}
226-
runs-on: ${{ matrix.runs_on || 'macos-10.15' }}
226+
runs-on: ${{ matrix.runs_on || 'macos-11' }}
227227
defaults:
228228
run:
229229
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
230230
strategy:
231231
matrix:
232232
include:
233233
- spec: cp36-macosx_x86_64
234+
cibw_version: cibuildwheel==2.11.1
234235
- spec: cp37-macosx_x86_64
236+
cibw_version: cibuildwheel==2.11.1
235237
- spec: cp38-macosx_x86_64
238+
cibw_version: cibuildwheel==2.11.1
236239
- spec: cp39-macosx_x86_64
237240
- spec: cp310-macosx_x86_64
238241
- spec: cp311-macosx_x86_64
@@ -286,7 +289,7 @@ jobs:
286289
SDKROOT: ${{ matrix.sdkroot || 'macosx' }}
287290
run: |
288291
python3 -V
289-
python3 -m pip install -U --user cibuildwheel
292+
python3 -m pip install -U --user ${{ matrix.cibw_version || 'cibuildwheel' }}
290293
python3 -m cibuildwheel --platform auto --output-dir dist .
291294
292295
- name: Upload artifacts
@@ -367,7 +370,7 @@ jobs:
367370
- platform: windows-2019
368371
build_arch: x64
369372
python_arch: x64
370-
spec: '3.11.0-rc.2'
373+
spec: '3.11'
371374
- platform: windows-2019
372375
build_arch: win32
373376
python_arch: x86
@@ -391,7 +394,7 @@ jobs:
391394
- platform: windows-2019
392395
build_arch: win32
393396
python_arch: x86
394-
spec: '3.11.0-rc.2'
397+
spec: '3.11'
395398
steps:
396399
# autocrlf screws up tests under Windows
397400
- name: Set git to use LF
@@ -427,7 +430,7 @@ jobs:
427430
run: |
428431
set -eux
429432
python -V
430-
python -m pip install Cython wheel
433+
python -m pip install "Cython<3.0" wheel
431434
432435
python setup.py \
433436
--with-libyaml build_ext \

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[build-system]
2-
requires = ["setuptools", "wheel", "Cython"]
2+
requires = ["setuptools", "wheel", "Cython<3.0"]
33
build-backend = "setuptools.build_meta"

0 commit comments

Comments
 (0)