Merge branch 'topic/default/release-for-py3.13' into 'branch/default'

Release for py3.13

See merge request fluiddyn/fluidsim!398

.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:
     - name: apt install
@@ -18,22 +18,22 @@ jobs:
         sudo apt install -y libfftw3-dev libfftw3-mpi-dev \
           libhdf5-openmpi-dev openmpi-bin libopenmpi-dev \
           libopenblas-dev
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pdm==2.15.4 nox
+        pip install pdm nox
     - name: Test with nox
       run: |
         nox -s test_without_fft_and_pythran
         mv .coverage/coverage.xml coverage_without_fft_and_pythran.xml
         nox -s test_with_fft_and_pythran
         mv .coverage/coverage.xml coverage_with_fft_and_pythran.xml
-    - 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-windows.yml

@@ -10,15 +10,12 @@ jobs:
     defaults:
       run:
         shell: bash -l {0}
-    strategy:
-      matrix:
-        python-version: ["3.10", "3.12"]
 
     steps:
     - uses: actions/checkout@v2
     - uses: prefix-dev/[email protected]
       with:
-        pixi-version: v0.27.1
+        pixi-version: v0.35.0
         cache: false
     - name: Tests
       run: |

.github/workflows/wheels.yml

@@ -26,9 +26,9 @@ jobs:
         with:
           python-version: 3.x
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.20.0
+        uses: pypa/cibuildwheel@v2.21.3
         env:
-          CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux* cp313-macosx_x86_64
+          CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux* cp313-macosx_x86_64
           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.20.0
+        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.20.0
+        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

@@ -24,6 +24,10 @@ See also the [unreleased changes].
 
 % Security   Security in case of vulnerabilities.
 
+## [0.8.4] (2024-11-08)
+
+- Python 3.13 compatibility
+
 ## [0.8.3] (2024-08-27)
 
 - New build with Transonic 0.7.2 to fix Windows wheels
@@ -340,4 +344,5 @@ Merge with geofluidsim (Ashwin Vishnu Mohanan repository)
 [0.8.1]: https://foss.heptapod.net/fluiddyn/fluidsim/-/compare/0.8.0...0.8.1
 [0.8.2]: https://foss.heptapod.net/fluiddyn/fluidsim/-/compare/0.8.1...0.8.2
 [0.8.3]: https://foss.heptapod.net/fluiddyn/fluidsim/-/compare/0.8.2...0.8.3
-[unreleased changes]: https://foss.heptapod.net/fluiddyn/fluidsim/-/compare/0.8.3...branch%2Fdefault
+[0.8.4]: https://foss.heptapod.net/fluiddyn/fluidsim/-/compare/0.8.3...0.8.4
+[unreleased changes]: https://foss.heptapod.net/fluiddyn/fluidsim/-/compare/0.8.4...branch%2Fdefault

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9
+FROM python:3.10
 LABEL Pierre Augier <[email protected]>
 
 RUN apt-get update
@@ -60,4 +60,4 @@ RUN wget https://foss.heptapod.net/fluiddyn/fluidfft/raw/branch/default/doc/inst
 RUN chmod +x install_pfft.sh
 RUN ./install_pfft.sh
 
-RUN python -m pip install -U pip pdm==2.15.4 nox --user
+RUN python -m pip install -U pip pdm nox --user

pixi.toml

@@ -16,11 +16,10 @@ install-dependencies = "pixi install && pip install -e ./lib && pip install 'tra
 install-editable = {cmd = "pip install -e . -v --no-build-isolation --no-deps", depends_on = ["install-dependencies"]}
 
 [dependencies]
-python = ">=3.9,<3.13"
+python = ">=3.9"
 numpy = ">=1.26.3"
 transonic = ">=0.5.3"
 fluiddyn = ">=0.5.2"
-fluidsim-core = ">=0.7.4"
 h5netcdf = ">=1.3.0"
 h5py = ">=3.10.0"
 xarray = ">=2023.12.0"

pyproject.toml

@@ -18,8 +18,8 @@ keywords = [
 authors = [
     {name = "pierre.augier", email = "[email protected]"},
 ]
-version = '0.8.3'
-requires-python = ">=3.9"
+version = '0.8.4'
+requires-python = ">=3.10"
 dependencies = [
     "fluidsim-core>=0.8.1",
     "h5py",
@@ -40,10 +40,10 @@ classifiers = [
       "License :: OSI Approved :: CEA CNRS Inria Logiciel Libre License, version 2.1 (CeCILL-2.1)",
       "Programming Language :: Python",
       "Programming Language :: Python :: 3",
-      "Programming Language :: Python :: 3.9",
       "Programming Language :: Python :: 3.10",
       "Programming Language :: Python :: 3.11",
       "Programming Language :: Python :: 3.12",
+      "Programming Language :: Python :: 3.13",
 ]
 readme = "README.md"
 license = {text = "CECILL-2.1"}
@@ -137,7 +137,7 @@ ignore_package_warnings = ["ipython"]
 # because meson-python editable build needs the build dependencies
 build = [
     "meson-python",
-    "numpy",
+    "numpy>=2.0.0",
     # "transonic@hg+https://foss.heptapod.net/fluiddyn/transonic@default",
     "transonic>=0.6.2",
     "pythran>=0.9.7",
@@ -159,8 +159,9 @@ dev = [
     "pylint",
     "flit_core >=3.2,<4",
     "-e fluidsim-core @ file:///${PROJECT_ROOT}/lib",
-    # build dependency mpi4py
+    # build dependencies mpi4py
     "cython >=3.0",
+    "setuptools",
 ]
 
 [tool.pdm.scripts]