Stowage/pyyaml
2
0
Fork 0
mirror of https://github.com/yaml/pyyaml.git synced 2025-10-19 11:03:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

block Cython 3.0+ as a build dep (#702)

Browse source 
* 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

(cherry picked from commit ae08bdc82b)
This commit is contained in:
Matt Davis 2023-07-18 00:53:03 +02:00 • committed by Matt Davis
parent 957ae4d495
commit 27f9a99306
No known key found for this signature in database
GPG key ID: 270F53F3C6D92108
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/ci.yaml vendored
View file

@ -197,7 +197,7 @@ jobs:
defaults: defaults:
run: run:
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }} shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
runs-on: ${{ matrix.runs_on || 'macos-10.15' }} runs-on: ${{ matrix.runs_on || 'macos-11' }}
steps: steps:
- name: Check cached libyaml state - name: Check cached libyaml state
id: cached_libyaml id: cached_libyaml
@ -225,7 +225,7 @@ jobs:
macos_pyyaml: macos_pyyaml:
needs: macos_libyaml needs: macos_libyaml
name: pyyaml ${{ matrix.spec }} name: pyyaml ${{ matrix.spec }}
runs-on: ${{ matrix.runs_on || 'macos-10.15' }} runs-on: ${{ matrix.runs_on || 'macos-11' }}
defaults: defaults:
run: run:
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }} shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
@ -233,6 +233,7 @@ jobs:
matrix: matrix:
include: include:
- spec: cp36-macosx_x86_64 - spec: cp36-macosx_x86_64
cibw_version: cibuildwheel==2.11.1
# - spec: cp37-macosx_x86_64 # - spec: cp37-macosx_x86_64
# - spec: cp38-macosx_x86_64 # - spec: cp38-macosx_x86_64
# - spec: cp39-macosx_x86_64 # - spec: cp39-macosx_x86_64
@ -288,7 +289,7 @@ jobs:
SDKROOT: ${{ matrix.sdkroot || 'macosx' }} SDKROOT: ${{ matrix.sdkroot || 'macosx' }}
run: | run: |
python3 -V python3 -V
python3 -m pip install -U --user cibuildwheel python3 -m pip install -U --user ${{ matrix.cibw_version || 'cibuildwheel' }}
python3 -m cibuildwheel --platform auto --output-dir dist . python3 -m cibuildwheel --platform auto --output-dir dist .
- name: Upload artifacts - name: Upload artifacts
@ -369,7 +370,7 @@ jobs:
- platform: windows-2019 - platform: windows-2019
build_arch: x64 build_arch: x64
python_arch: x64 python_arch: x64
spec: '3.11.0-rc.2' spec: '3.11'
- platform: windows-2019 - platform: windows-2019
build_arch: win32 build_arch: win32
python_arch: x86 python_arch: x86
@ -393,7 +394,7 @@ jobs:
- platform: windows-2019 - platform: windows-2019
build_arch: win32 build_arch: win32
python_arch: x86 python_arch: x86
spec: '3.11.0-rc.2' spec: '3.11'
steps: steps:
# autocrlf screws up tests under Windows # autocrlf screws up tests under Windows
- name: Set git to use LF - name: Set git to use LF
@ -429,7 +430,7 @@ jobs:
run: | run: |
set -eux set -eux
python -V python -V
python -m pip install Cython wheel python -m pip install "Cython<3.0" wheel
python setup.py \ python setup.py \
--with-libyaml build_ext \ --with-libyaml build_ext \

15
.github/workflows/manual_artifact_build.yaml vendored
View file

@ -195,7 +195,7 @@ jobs:
defaults: defaults:
run: run:
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }} shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
runs-on: ${{ matrix.runs_on || 'macos-10.15' }} runs-on: ${{ matrix.runs_on || 'macos-11' }}
steps: steps:
- name: Check cached libyaml state - name: Check cached libyaml state
id: cached_libyaml id: cached_libyaml
@ -223,7 +223,7 @@ jobs:
macos_pyyaml: macos_pyyaml:
needs: macos_libyaml needs: macos_libyaml
name: pyyaml ${{ matrix.spec }} name: pyyaml ${{ matrix.spec }}
runs-on: ${{ matrix.runs_on || 'macos-10.15' }} runs-on: ${{ matrix.runs_on || 'macos-11' }}
defaults: defaults:
run: run:
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }} shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
@ -231,8 +231,11 @@ jobs:
matrix: matrix:
include: include:
- spec: cp36-macosx_x86_64 - spec: cp36-macosx_x86_64
cibw_version: cibuildwheel==2.11.1
- spec: cp37-macosx_x86_64 - spec: cp37-macosx_x86_64
cibw_version: cibuildwheel==2.11.1
- spec: cp38-macosx_x86_64 - spec: cp38-macosx_x86_64
cibw_version: cibuildwheel==2.11.1
- spec: cp39-macosx_x86_64 - spec: cp39-macosx_x86_64
- spec: cp310-macosx_x86_64 - spec: cp310-macosx_x86_64
- spec: cp311-macosx_x86_64 - spec: cp311-macosx_x86_64
@ -286,7 +289,7 @@ jobs:
SDKROOT: ${{ matrix.sdkroot || 'macosx' }} SDKROOT: ${{ matrix.sdkroot || 'macosx' }}
run: | run: |
python3 -V python3 -V
python3 -m pip install -U --user cibuildwheel python3 -m pip install -U --user ${{ matrix.cibw_version || 'cibuildwheel' }}
python3 -m cibuildwheel --platform auto --output-dir dist . python3 -m cibuildwheel --platform auto --output-dir dist .
- name: Upload artifacts - name: Upload artifacts
@ -367,7 +370,7 @@ jobs:
- platform: windows-2019 - platform: windows-2019
build_arch: x64 build_arch: x64
python_arch: x64 python_arch: x64
spec: '3.11.0-rc.2' spec: '3.11'
- platform: windows-2019 - platform: windows-2019
build_arch: win32 build_arch: win32
python_arch: x86 python_arch: x86
@ -391,7 +394,7 @@ jobs:
- platform: windows-2019 - platform: windows-2019
build_arch: win32 build_arch: win32
python_arch: x86 python_arch: x86
spec: '3.11.0-rc.2' spec: '3.11'
steps: steps:
# autocrlf screws up tests under Windows # autocrlf screws up tests under Windows
- name: Set git to use LF - name: Set git to use LF
@ -427,7 +430,7 @@ jobs:
run: | run: |
set -eux set -eux
python -V python -V
python -m pip install Cython wheel python -m pip install "Cython<3.0" wheel
python setup.py \ python setup.py \
--with-libyaml build_ext \ --with-libyaml build_ext \

2
pyproject.toml
View file

@ -1,3 +1,3 @@
[build-system] [build-system]
requires = ["setuptools", "wheel", "Cython"] requires = ["setuptools", "wheel", "Cython<3.0"]
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"