Merge branch 'topic/default/fix-get_simple_mpi-methods' into 'branch/…

…default'

Fix get_simple_2d_mpi_method

See merge request fluiddyn/fluidfft!65

.github/workflows/wheels.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           python-version: 3.x
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.19.2
         env:
           CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
           CIBW_ARCHS: ${{ matrix.architecture }}
@@ -49,7 +49,7 @@ jobs:
         with:
           python-version: 3.x
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.19.2
         env:
           CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
           CIBW_ARCHS: ${{ matrix.architecture }}
@@ -79,7 +79,7 @@ jobs:
           python-version: 3.x
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.19.2
         env:
           CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
           CIBW_ARCHS: aarch64
@@ -111,7 +111,7 @@ jobs:
         name: sdist
     - uses: actions/setup-python@v5
       with:
-        python-version: 3.11
+        python-version: 3.12
     - run: |
         pip install pip -U
         ls

pyproject.toml

@@ -74,8 +74,8 @@ test = [
     "pytest-cov",
     "cython", # needed at run time for coverage
     # needed to build the plugins
-    "flit_core",
     "pip",
+    "flit_core",
     "-e fluidfft-builder @ file:///${PROJECT_ROOT}/plugins/fluidfft-builder",
 ]
 dev = ["ipython"]
@@ -89,6 +89,7 @@ doc = [
     "pandas",
     "pyfftw",
     # needed to create the dummy modules
+    "flit_core",
     "-e fluidfft-builder @ file:///${PROJECT_ROOT}/plugins/fluidfft-builder",
 ]
 lint = ["black", "pylint"]

src/fluidfft/fft2d/operators.py

@@ -60,7 +60,7 @@ def get_simple_2d_mpi_method():
     method = "fft2d.mpi_with_fftwmpi2d"
     try:
         import_fft_class(method)
-    except ImportError:
+    except (ImportError, ValueError):
         method = "fft2d.mpi_with_fftw1d"
     return method
 

src/fluidfft/fft3d/operators.py

@@ -121,7 +121,7 @@ def get_simple_3d_mpi_method():
     method = "fft3d.mpi_with_fftwmpi3d"
     try:
         import_fft_class(method)
-    except ImportError:
+    except (ImportError, ValueError):
         method = "fft3d.mpi_with_fftw1d"
     return method