Skip to content

Commit

Permalink
Fully allow Cython 3.
Browse files Browse the repository at this point in the history
  • Loading branch information
moorepants committed Nov 5, 2023
1 parent 9b9d98d commit 0f3cfbd
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
channels: conda-forge
miniforge-variant: Mambaforge
- name: Install basic dependencies
run: mamba install -y -v lapack "libblas=*=*netlib" "cython=0.29.*" "ipopt=${{ matrix.ipopt-version }}" numpy>=1.21.5 pkg-config>=0.29.2 setuptools>=44.1.1 --file docs/requirements.txt
run: mamba install -y -v lapack "libblas=*=*netlib" "cython>=0.29.28" "ipopt=${{ matrix.ipopt-version }}" numpy>=1.21.5 pkg-config>=0.29.2 setuptools>=44.1.1 --file docs/requirements.txt
- name: Install CyIpopt
run: |
rm pyproject.toml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
miniforge-variant: Mambaforge
- name: Install basic dependencies against generic blas/lapack
run: |
mamba install -q -y lapack "libblas=*=*netlib" "ipopt=${{ matrix.ipopt-version }}" "numpy>=1.21.5" "pkg-config>=0.29.2" "setuptools>=44.1.1" "cython=0.29.*"
mamba install -q -y lapack "libblas=*=*netlib" "ipopt=${{ matrix.ipopt-version }}" "numpy>=1.21.5" "pkg-config>=0.29.2" "setuptools>=44.1.1" "cython>=0.29.28"
- run: echo "IPOPTWINDIR=USECONDAFORGEIPOPT" >> $GITHUB_ENV
- name: Install CyIpopt
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- run: python -m pip install "numpy>=1.21.5" "cython>=0.29.28,<3" "setuptools>44.1.1"
- run: python -m pip install "numpy>=1.21.5" "cython>=0.29.28" "setuptools>44.1.1"
- run: Invoke-WebRequest -Uri "https://github.com/coin-or/Ipopt/releases/download/releases%2F3.13.3/Ipopt-3.13.3-win64-msvs2019-md.zip" -OutFile "Ipopt-3.13.3-win64-msvs2019-md.zip"
- run: 7z x Ipopt-3.13.3-win64-msvs2019-md.zip
- run: mv Ipopt-3.13.3-win64-msvs2019-md/* .
Expand Down
2 changes: 1 addition & 1 deletion conda/cyipopt-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: cyipopt-dev
channels:
- conda-forge
dependencies:
- cython >=0.29.28,<3
- cython >=0.29.28
- ipopt >=3.12
- libblas * *netlib
- numpy >=1.21.5
Expand Down
2 changes: 1 addition & 1 deletion docs/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies:
* Ipopt >=3.12 [>= 3.13 on Windows]
* Python 3.8+
* setuptools >=44.1.1
* cython >=0.29.28,<3
* cython >=0.29.28
* NumPy >=1.21.5
* SciPy >=1.8 [optional]

Expand Down

0 comments on commit 0f3cfbd

Please sign in to comment.