Skip to content

Commit

Permalink
Merge pull request #2815 from boutproject/master-into-next
Browse files Browse the repository at this point in the history
 Some recent maintenance fixes back into `next` from `master`
  • Loading branch information
ZedThree authored Nov 22, 2023
2 parents 3ab9e61 + 8ce9759 commit b92c60e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 25 deletions.
1 change: 1 addition & 0 deletions .ci_fedora.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ else
. /etc/profile.d/modules.sh
module load mpi/${1}-x86_64
export OMPI_MCA_rmaps_base_oversubscribe=yes
export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
export TRAVIS=true
export FLEXIBLAS=NETLIB
cd
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
OMP_NUM_THREADS: ${{ matrix.config.omp_num_threads }}
PYTHONPATH: ${{ github.workspace }}/tools/pylib
OMPI_MCA_rmaps_base_oversubscribe: yes
PRTE_MCA_rmaps_default_mapping_policy: ":oversubscribe"
MPIRUN: mpiexec -np
strategy:
fail-fast: true
Expand Down Expand Up @@ -185,9 +186,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
Expand Down
20 changes: 0 additions & 20 deletions .pip_install_for_ci.sh

This file was deleted.

6 changes: 4 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit b92c60e

Please sign in to comment.