Merge branch 'topic/default/new-version-py3.13' into 'branch/default'

Prepare new version for Python 3.13

See merge request fluiddyn/fluidfft!70

.github/workflows/ci-linux.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
 
@@ -21,12 +21,12 @@ jobs:
           libopenblas-dev
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -53,7 +53,7 @@ jobs:
 
     - name: Upload coverage to codecov
       if: ${{ success() }}
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: false # optional (default = false)

.github/workflows/ci-pixi.yml

@@ -11,20 +11,22 @@ jobs:
       fail-fast: false
       matrix:
         os: ["windows-2022", "macos-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
     defaults:
       run:
         shell: bash -l {0}
     steps:
     - uses: actions/checkout@v3
     - uses: prefix-dev/setup-pixi@v0.8.1
       with:
-        pixi-version: v0.26.1
+        pixi-version: v0.35.0
         cache: false
     - name: Install
       run: |
         pixi run install-editable
         pixi run pip install plugins/fluidfft-fftw -v --no-build-isolation --no-deps
+        pixi run python -c "import fluidfft_fftw.fft2d as m; print(m)"
+        ls .pixi/envs/default/Lib/site-packages/fluidfft_fftw/fft2d
+        pixi run python -c "import fluidfft_fftw.fft2d.with_fftw1d"
     - name: Tests
       run: |
         pixi run pytest -v -s tests

.github/workflows/wheels.yml

@@ -26,9 +26,9 @@ jobs:
         with:
           python-version: 3.x
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19.2
+        uses: pypa/cibuildwheel@v2.21.3
         env:
-          CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
+          CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
           CIBW_ARCHS: ${{ matrix.architecture }}
       - uses: actions/upload-artifact@v4
         with:
@@ -49,9 +49,9 @@ jobs:
         with:
           python-version: 3.x
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19.2
+        uses: pypa/cibuildwheel@v2.21.3
         env:
-          CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
+          CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
           CIBW_ARCHS: ${{ matrix.architecture }}
           # increase pip debugging output
           # CIBW_BUILD_VERBOSITY: 2
@@ -79,9 +79,9 @@ jobs:
           python-version: 3.x
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19.2
+        uses: pypa/cibuildwheel@v2.21.3
         env:
-          CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
+          CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
           CIBW_ARCHS: aarch64
       - uses: actions/upload-artifact@v4
         with:
@@ -111,7 +111,7 @@ jobs:
         name: sdist
     - uses: actions/setup-python@v5
       with:
-        python-version: 3.12
+        python-version: 3.13
     - run: |
         pip install pip -U
         ls

CHANGES.md

@@ -2,6 +2,10 @@
 
 See also the [unreleased changes].
 
+## [0.4.3] (2024-11-07)
+
+- Compatibility Python 3.13
+
 ## [0.4.2] (2024-08-22)
 
 - Compatibility mpi4py 4.0
@@ -120,4 +124,5 @@ See also the [unreleased changes].
 [0.4.0]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.3.5...0.4.0
 [0.4.1]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.0...0.4.1
 [0.4.2]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.1...0.4.2
-[unreleased changes]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.2...branch%2Fdefault
+[0.4.3]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.2...0.4.3
+[unreleased changes]: https://foss.heptapod.net/fluiddyn/fluidfft/-/compare/0.4.3...branch%2Fdefault

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9
+FROM python:3.10
 LABEL Pierre Augier <pierre.augier@univ-grenoble-alpes.fr>
 
 RUN apt-get update

pixi.toml

@@ -18,11 +18,10 @@ install-mpi_with_fftw = "pip install -e plugins/fluidfft-mpi_with_fftw --no-buil
 install-fftwmpi = "pip install -e plugins/fluidfft-fftwmpi --no-build-isolation -v"
 
 [dependencies]
-python = ">=3.9"
+python = ">=3.10"
 numpy = ">=1.26.3"
 transonic = ">=0.6.4"
 fluiddyn = ">=0.5.2"
-fluidsim-core = ">=0.7.4"
 h5netcdf = ">=1.3.0"
 h5py = ">=3.10.0"
 xarray = ">=2023.12.0"
@@ -35,9 +34,6 @@ ipython = ">=8.20.0"
 coverage = ">=7.4.0"
 pytest-cov = ">=4.1.0"
 pytest-mock = ">=3.12.0"
-ninja = ">=1.11.1"
-meson = ">=1.3.1"
-meson-python = ">=0.15.0"
 cython = ">=3.0.8"
 fftw = ">=3.3.10"
 pkg-config = ">=0.29.2"
@@ -49,6 +45,14 @@ pytest-allclose = "*"
 importlib-metadata = "*"
 
 [build-dependencies]
+meson = ">=1.3.1"
+ninja = ">=1.11.1"
 meson-python = ">=0.15.0"
 pythran = ">=0.15.0"
 transonic = ">=0.6.1"
+
+[target.linux-64.dependencies]
+cxx-compiler = ">=1.0.0,<2"
+
+[target.win-64.dependencies]
+m2w64-gcc = ">=5.3.0,<6"

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = 'mesonpy'
 
 [project]
 name = "fluidfft"
-version = "0.4.2"
+version = "0.4.3"
 description = "Efficient and easy Fast Fourier Transform (FFT) for Python."
 authors = [
     {name = "Pierre Augier", email = "pierre.augier@legi.cnrs.fr"},
@@ -15,7 +15,7 @@ dependencies = [
     "transonic >= 0.6.4",
     "importlib_metadata; python_version < '3.10'",
 ]
-requires-python = ">= 3.9"
+requires-python = ">= 3.10"
 readme = "README.md"
 license = {text = "CeCILL License"}
 keywords = [
@@ -35,7 +35,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Scientific/Engineering",
 ]