Try to fix CI...

fluiddyn · Jan 25, 2024 · 2af5731 · 2af5731
1 parent 05fde86
commit 2af5731
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/.github/fluidfft-site.cfg → .github/fluidfft-site-mpi.cfg b/.github/fluidfft-site.cfg → .github/fluidfft-site-mpi.cfg
diff --git a/.github/fluidfft-site-macos.cfg → .github/fluidfft-site-seq.cfg b/.github/fluidfft-site-macos.cfg → .github/fluidfft-site-seq.cfg
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -37,8 +37,9 @@ jobs:
 
     - name: Run tests
       run: |
-        cp .github/fluidfft-site.cfg $HOME/.fluidfft-site.cfg
+        cp .github/fluidfft-site-seq.cfg $HOME/.fluidfft-site.cfg
         nox --session "tests(with_cov=True, with_mpi=False)"
+        cp .github/fluidfft-site-mpi.cfg $HOME/.fluidfft-site.cfg
         nox --session "tests(with_cov=True, with_mpi=True)"
         coverage xml
 

diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -24,7 +24,7 @@ jobs:
         use-mamba: true
     - name: Install
       run: |
-        cp .github/fluidfft-site-macos.cfg $HOME/.fluidfft-site.cfg
+        cp .github/fluidfft-site-seq.cfg $HOME/.fluidfft-site.cfg
         pip install -e . -v --no-build-isolation --no-deps
     - name: Tests
       run: |

diff --git a/noxfile.py b/noxfile.py
@@ -71,7 +71,7 @@ def run_command(command, **kwargs):
     if with_mpi:
         if with_cov:
             command = (
-                "mpirun -np 2 --oversubscribe coverage run -p -m pytest --exitfirst src"
+                "mpirun -np 2 --oversubscribe coverage run -p -m pytest -v -s --exitfirst src"
             )
 
         else:

diff --git a/pyproject.toml b/pyproject.toml
@@ -81,7 +81,7 @@ fluidfft-bench-analysis = "fluidfft.bench_analysis:run"
 "fft3d.mpi_with_p3dfft" = "fluidfft.fft3d.mpi_with_p3dfft"
 
 # should be in fluidfft-pfft
-"fft3d.mpi_with_pfft" = "fluidfft.fft3d.mpi_with_pfft"
+# "fft3d.mpi_with_pfft" = "fluidfft.fft3d.mpi_with_pfft"
 
 # should be in fluidfft-mpi4pyfft (a pure Python package)
 "fft3d.mpi_with_mpi4pyfft" = "fluidfft.fft3d.mpi_with_mpi4pyfft"