Skip to content

Commit

Permalink
Merge pull request #4687 from neutrinoceros/require_cython_3.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
neutrinoceros committed Oct 10, 2023
2 parents 2310842 + 81ef8e0 commit 14c49c4
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/bleeding-edge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,14 @@ jobs:
# incompatibility with Cython 3
# see https://github.com/yaml/pyyaml/issues/601
# and https://github.com/cython/cython/issues/4568
# Cython 3.0.2 has a defect on Python 3.12, so we install the -fixed- dev version
# from source for now.
# see https://github.com/cython/cython/issues/5724
# Cython can be installed from PyPI binaries again when the patch is included
# in a release (likely in version 3.0.3)
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools wheel
python -m pip install --pre --only-binary ":all:" numpy matplotlib \
--extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
python -m pip install --pre ewah-bool-utils
python -m pip install --pre ewah-bool-utils Cython
python -m pip install git+https://github.com/yt-project/unyt.git
python -m pip install --pre pytest PyYAML
python -m pip install git+https://github.com/cython/cython.git
- name: Build
# --no-build-isolation is used to guarantee that build time dependencies
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ jobs:
dependencies: full
tests-type: answer
test-runner: nose
- os: ubuntu-latest
# minimal tests with Python 3.12 and no optional dependencies
# TODO: when all optional dependencies are compatibles,
# remove this and bump 3.11 -> 3.12 on all arch with 'full' dependencies
# see https://github.com/yt-project/yt/issues/4689
python-version: '3.12'
dependencies: ''
tests-type: unit
test-runner: pytest

runs-on: ${{ matrix.os }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/wheels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.12'
- name: install check-manifest
run: |
python -m pip install --upgrade pip
Expand All @@ -86,8 +86,8 @@ jobs:

# keep in sync with pyproject.toml
run: |
python -m pip install "Cython>=3.0,<3.1"
python -m pip install oldest-supported-numpy
python -m pip install "Cython>=3.0.3, <3.1"
python -m pip install numpy>=1.25
python -m pip install ewah-bool-utils>=1.0.2
python -m pip install --upgrade wheel
python -m pip install --upgrade setuptools
Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ requires = [

# for the upper pin in Cython
# see https://github.com/yt-project/yt/issues/4044
# TODO: bump minimal Cython version to 3.0.3 when released
# see https://github.com/yt-project/yt/issues/4675
"Cython>=3.0, <3.1",
"Cython>=3.0.3, <3.1",
"numpy>=1.25, <2.0",
"ewah-bool-utils>=1.0.2",
]
Expand Down

0 comments on commit 14c49c4

Please sign in to comment.