Skip to content

Commit 2ccb37e

Browse files
committed
Update for python 3.12 and remove cython<3 pinning
1 parent bc657b2 commit 2ccb37e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/test_conda_builds.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
conda activate dedalus2
7070
conda env config vars set OMP_NUM_THREADS=1
7171
conda env config vars set NUMEXPR_MAX_THREADS=1
72-
conda install -y -c conda-forge dedalus c-compiler "h5py=*=mpi*" "cython<3.0"
72+
conda install -y -c conda-forge dedalus c-compiler cython "h5py=*=mpi*"
7373
conda uninstall -y --force dedalus
7474
CC=mpicc pip3 install --no-cache --no-build-isolation http://github.com/dedalusproject/dedalus/zipball/v2_master/
7575
- name: Test build
@@ -103,7 +103,7 @@ jobs:
103103
conda activate dedalus3
104104
conda env config vars set OMP_NUM_THREADS=1
105105
conda env config vars set NUMEXPR_MAX_THREADS=1
106-
conda install -y -c conda-forge dedalus c-compiler "h5py=*=mpi*" "cython<3.0"
106+
conda install -y -c conda-forge dedalus c-compiler cython "h5py=*=mpi*"
107107
conda uninstall -y --force dedalus
108108
CC=mpicc pip3 install --no-cache --no-build-isolation http://github.com/dedalusproject/dedalus/zipball/master/
109109
- name: Test build

conda_install_dedalus2.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ INSTALL_HDF5=1
3636
BLAS="openblas"
3737

3838
# Python version
39-
PYTHON_VERSION="3.10"
39+
PYTHON_VERSION="3.12"
4040

4141
# Install native arm64 build on Apple Silicon
4242
# Note: Only relevent on Apple Silicon machines, where native arm64 builds may exhibit errors
@@ -151,7 +151,7 @@ conda config --add channels conda-forge
151151
conda config --set channel_priority strict
152152

153153
echo "Installing conda-forge python, pip, wheel, setuptools, cython"
154-
conda install "${CARGS[@]}" "python=${PYTHON_VERSION}" pip wheel setuptools "cython<3.0"
154+
conda install "${CARGS[@]}" "python=${PYTHON_VERSION}" pip wheel setuptools cython
155155

156156
case "${BLAS}" in
157157
"openblas")

conda_install_dedalus3.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ INSTALL_HDF5=1
3636
BLAS="openblas"
3737

3838
# Python version
39-
PYTHON_VERSION="3.10"
39+
PYTHON_VERSION="3.12"
4040

4141
# Install native arm64 build on Apple Silicon
4242
# Note: Only relevent on Apple Silicon machines, where native arm64 builds may exhibit errors
@@ -151,7 +151,7 @@ conda config --add channels conda-forge
151151
conda config --set channel_priority strict
152152

153153
echo "Installing conda-forge python, pip, wheel, setuptools, cython"
154-
conda install "${CARGS[@]}" "python=${PYTHON_VERSION}" pip wheel setuptools "cython<3.0"
154+
conda install "${CARGS[@]}" "python=${PYTHON_VERSION}" pip wheel setuptools cython
155155

156156
case "${BLAS}" in
157157
"openblas")

0 commit comments

Comments
 (0)