Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ jobs:
defaults:
run:
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:
- name: Check cached libyaml state
id: cached_libyaml
Expand Down Expand Up @@ -225,14 +225,15 @@ jobs:
macos_pyyaml:
needs: macos_libyaml
name: pyyaml ${{ matrix.spec }}
runs-on: ${{ matrix.runs_on || 'macos-10.15' }}
runs-on: ${{ matrix.runs_on || 'macos-11' }}
defaults:
run:
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
strategy:
matrix:
include:
- spec: cp36-macosx_x86_64
cibw_version: cibuildwheel==2.11.1
# - spec: cp37-macosx_x86_64
# - spec: cp38-macosx_x86_64
# - spec: cp39-macosx_x86_64
Expand Down Expand Up @@ -288,7 +289,7 @@ jobs:
SDKROOT: ${{ matrix.sdkroot || 'macosx' }}
run: |
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 .

- name: Upload artifacts
Expand Down Expand Up @@ -369,7 +370,7 @@ jobs:
- platform: windows-2019
build_arch: x64
python_arch: x64
spec: '3.11.0-rc.2'
spec: '3.11'
- platform: windows-2019
build_arch: win32
python_arch: x86
Expand All @@ -393,7 +394,7 @@ jobs:
- platform: windows-2019
build_arch: win32
python_arch: x86
spec: '3.11.0-rc.2'
spec: '3.11'
steps:
# autocrlf screws up tests under Windows
- name: Set git to use LF
Expand Down Expand Up @@ -429,7 +430,7 @@ jobs:
run: |
set -eux
python -V
python -m pip install Cython wheel
python -m pip install "Cython<3.0" wheel

python setup.py \
--with-libyaml build_ext \
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/manual_artifact_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
defaults:
run:
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:
- name: Check cached libyaml state
id: cached_libyaml
Expand Down Expand Up @@ -223,16 +223,19 @@ jobs:
macos_pyyaml:
needs: macos_libyaml
name: pyyaml ${{ matrix.spec }}
runs-on: ${{ matrix.runs_on || 'macos-10.15' }}
runs-on: ${{ matrix.runs_on || 'macos-11' }}
defaults:
run:
shell: ${{ matrix.run_wrapper || 'bash --noprofile --norc -eo pipefail {0}' }}
strategy:
matrix:
include:
- spec: cp36-macosx_x86_64
cibw_version: cibuildwheel==2.11.1
- spec: cp37-macosx_x86_64
cibw_version: cibuildwheel==2.11.1
- spec: cp38-macosx_x86_64
cibw_version: cibuildwheel==2.11.1
- spec: cp39-macosx_x86_64
- spec: cp310-macosx_x86_64
- spec: cp311-macosx_x86_64
Expand Down Expand Up @@ -286,7 +289,7 @@ jobs:
SDKROOT: ${{ matrix.sdkroot || 'macosx' }}
run: |
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 .

- name: Upload artifacts
Expand Down Expand Up @@ -367,7 +370,7 @@ jobs:
- platform: windows-2019
build_arch: x64
python_arch: x64
spec: '3.11.0-rc.2'
spec: '3.11'
- platform: windows-2019
build_arch: win32
python_arch: x86
Expand All @@ -391,7 +394,7 @@ jobs:
- platform: windows-2019
build_arch: win32
python_arch: x86
spec: '3.11.0-rc.2'
spec: '3.11'
steps:
# autocrlf screws up tests under Windows
- name: Set git to use LF
Expand Down Expand Up @@ -427,7 +430,7 @@ jobs:
run: |
set -eux
python -V
python -m pip install Cython wheel
python -m pip install "Cython<3.0" wheel

python setup.py \
--with-libyaml build_ext \
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[build-system]
requires = ["setuptools", "wheel", "Cython"]
requires = ["setuptools", "wheel", "Cython<3.0"]
build-backend = "setuptools.build_meta"