diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6aaedb5804..148b6e17db 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -185,9 +185,8 @@ jobs: - name: Install pip packages run: | - ./.pip_install_for_ci.sh 'cython~=0.29' 'netcdf4~=1.5' 'sympy~=1.5' 'gcovr' 'cmake' zoidberg fastcov - # Add the pip install location to the runner's PATH - echo ~/.local/bin >> $GITHUB_PATH + python -m pip install --upgrade pip setuptools + python -m pip install -r requirements.txt - name: Cache SUNDIALS build uses: actions/cache@v3 diff --git a/.pip_install_for_ci.sh b/.pip_install_for_ci.sh deleted file mode 100755 index 4a5258cc2d..0000000000 --- a/.pip_install_for_ci.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -set -e - -export PATH=${HOME}/.local/bin:${PATH} -pip3 install --user --upgrade pip~=20.0 setuptools~=46.1 -pip3 install --user --upgrade scipy~=1.4 numpy~=1.18 natsort~=8.1.0 -for package in $@ -do - if test $package == "cython" - then - # fast install Cython - pip3 install --user Cython --install-option="--no-cython-compile" - elif test $package == "something_else" - then - pip3 install what_we_need - else - pip3 install --user $package - fi -done diff --git a/requirements.txt b/requirements.txt index 03f43a92d2..75358b10db 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,8 @@ Jinja2>=2.11.3 numpy>=1.14.1 scipy>=1.0.0 -netcdf4>=1.3.1 +netcdf4~=1.6.0 matplotlib>=2.0.0 -Cython>=0.29.0 +Cython~=3.0.0 +boututils~=0.2.1 +boutdata~=0.2.1