From 3c3b1d1fefd6e9618b22698a14ef4c8a52da0bfd Mon Sep 17 00:00:00 2001 From: Lourens Veen Date: Wed, 4 Mar 2026 17:23:06 +0100 Subject: [PATCH] Use python-gil package on conda (#1214) --- .github/workflows/test-framework.yml | 2 +- .github/workflows/test-seba.yml | 2 +- support/setup/dependencies.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-framework.yml b/.github/workflows/test-framework.yml index acb03c2217..640660c06e 100644 --- a/.github/workflows/test-framework.yml +++ b/.github/workflows/test-framework.yml @@ -39,7 +39,7 @@ jobs: - name: Install dependencies run: | - conda install c-compiler cxx-compiler fortran-compiler 'gfortran<14' python pkgconfig coreutils patch curl tar unzip gzip bzip2 xz perl bison make cmake openmpi gsl fftw gmp mpfr hdf5 netcdf4 libopenblas liblapack zlib pip wheel 'docutils>=0.6' 'mpi4py>=1.1.0' 'numpy>=1.2.2' 'h5py>=1.1.0' pytest + conda install c-compiler cxx-compiler fortran-compiler 'gfortran<14' python-gil pkgconfig coreutils patch curl tar unzip gzip bzip2 xz perl bison make cmake openmpi gsl fftw gmp mpfr hdf5 netcdf4 libopenblas liblapack zlib pip wheel 'docutils>=0.6' 'mpi4py>=1.1.0' 'numpy>=1.2.2' 'h5py>=1.1.0' pytest # - name: Configure OpenMPI # run: | diff --git a/.github/workflows/test-seba.yml b/.github/workflows/test-seba.yml index b99dee76bb..ffd9f1eb2e 100644 --- a/.github/workflows/test-seba.yml +++ b/.github/workflows/test-seba.yml @@ -41,7 +41,7 @@ jobs: - name: Install dependencies run: | - conda install c-compiler cxx-compiler fortran-compiler 'gfortran<14' python pkgconfig coreutils patch curl tar unzip gzip bzip2 xz perl bison make cmake openmpi gsl fftw gmp mpfr hdf5 netcdf4 libopenblas liblapack zlib pip wheel 'docutils>=0.6' 'mpi4py>=1.1.0' 'numpy>=1.2.2' 'h5py>=1.1.0' pytest + conda install c-compiler cxx-compiler fortran-compiler 'gfortran<14' python-gil pkgconfig coreutils patch curl tar unzip gzip bzip2 xz perl bison make cmake openmpi gsl fftw gmp mpfr hdf5 netcdf4 libopenblas liblapack zlib pip wheel 'docutils>=0.6' 'mpi4py>=1.1.0' 'numpy>=1.2.2' 'h5py>=1.1.0' pytest # - name: Configure OpenMPI # run: | diff --git a/support/setup/dependencies.sh b/support/setup/dependencies.sh index 0e72a776a2..170ad75490 100644 --- a/support/setup/dependencies.sh +++ b/support/setup/dependencies.sh @@ -33,7 +33,7 @@ # MESA r15140 fails its tests when compiled with gfortran 14 -DEPS_conda="c-compiler cxx-compiler fortran-compiler 'gfortran<14' python pkgconfig" +DEPS_conda="c-compiler cxx-compiler fortran-compiler 'gfortran<14' python-gil pkgconfig" DEPS_conda="${DEPS_conda} coreutils patch" DEPS_conda="${DEPS_conda} curl tar unzip gzip bzip2 xz perl bison make cmake openmpi" DEPS_conda="${DEPS_conda} gsl fftw gmp mpfr hdf5 netcdf4 qhull healpix_cxx libopenblas"