Merge default in kolmo-law-ns3d

Author: paugier

.github/workflows/ci-linux.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.11", "3.12", "3.13", "3.14"]
 
     steps:
     - name: apt install
@@ -18,7 +18,7 @@ jobs:
         sudo apt install -y libfftw3-dev libfftw3-mpi-dev \
           libhdf5-openmpi-dev openmpi-bin libopenmpi-dev \
           libopenblas-dev
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
@@ -33,7 +33,7 @@ jobs:
         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@v4
+    - uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: false # optional (default = false)

.github/workflows/ci-windows.yml

@@ -1,4 +1,4 @@
-name: CI-windows
+name: CI Windows
 
 on:
   - push
@@ -13,9 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: prefix-dev/setup-pixi@v0.8.1
+    - uses: prefix-dev/setup-pixi@v0.9.3
       with:
-        pixi-version: v0.35.0
+        pixi-version: v0.59.0
         cache: false
     - name: Tests
       run: |

.github/workflows/wheels.yml

@@ -21,14 +21,14 @@ jobs:
           - os: macos
             architecture: arm64
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v3.2.1
         env:
-          CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux* cp313-macosx_x86_64
+          CIBW_SKIP: pp* cp38-* cp39-* cp310-* *-musllinux*
           CIBW_ARCHS: ${{ matrix.architecture }}
       - uses: actions/upload-artifact@v4
         with:
@@ -44,14 +44,14 @@ jobs:
           - os: windows
             architecture: AMD64
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v3.2.1
         env:
-          CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
+          CIBW_SKIP: pp* cp38-* cp39-* cp310-* *-musllinux*
           CIBW_ARCHS: ${{ matrix.architecture }}
           # increase pip debugging output
           # CIBW_BUILD_VERBOSITY: 2
@@ -69,7 +69,7 @@ jobs:
       startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: docker/setup-qemu-action@v2
         with:
           platforms: arm64
@@ -79,9 +79,9 @@ jobs:
           python-version: 3.x
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v3.2.1
         env:
-          CIBW_SKIP: pp* cp36-* cp37-* cp38-* cp39-* *-musllinux*
+          CIBW_SKIP: pp* cp38-* cp39-* cp310-* *-musllinux*
           CIBW_ARCHS: aarch64
       - uses: actions/upload-artifact@v4
         with:
@@ -91,9 +91,9 @@ jobs:
   sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: echo ${{ github.ref }}
-      - run: python -m pip install build twine
+      - run: python -m pip install build twine packaging -U
       - run: python -m build --sdist
       - run: twine check --strict dist/*
       - uses: actions/upload-artifact@v4

.gitlab-ci.yml

@@ -116,7 +116,19 @@ image:build:
       --cleanup
       --destination $DOCKER_IMAGE_PATH:stable
 
+
+.check_nox_pdm: &check_nox_pdm
+  before_script:
+    - nox --version
+    - pdm --version
+    # to avoid hishel>=1 (using hishel 0.1.5)
+    # leading to IO problems on osuosl runners
+    - uv tool install pdm==2.26.2
+    - pdm --version
+
+
 validate_code:
+  <<: *check_nox_pdm
   stage: lint
   needs:
     - job: "image:build"
@@ -125,34 +137,33 @@ validate_code:
     - nox -s validate_code
 
 
-test_without_fft_and_pythran:
+.test_with_nox:
+  <<: *check_nox_pdm
   stage: test
   needs:
     - job: "image:build"
       optional: true
   script:
-    - nox -s test_without_fft_and_pythran
+    - nox --version
+    - pdm --version
+    - nox -s $NOX_SESSION
     - mkdir $COVERAGE_DIR
     - cp -r .coverage/* $COVERAGE_DIR
   artifacts:
     paths:
       - $COVERAGE_DIR/*
     expire_in: 60 mins
 
+test_without_fft_and_pythran:
+  extends: .test_with_nox
+  variables:
+    NOX_SESSION: "test_without_fft_and_pythran"
+
 test_with_fft_and_pythran:
-  stage: test
+  extends: .test_with_nox
+  variables:
+    NOX_SESSION: "test_with_fft_and_pythran"
   timeout: 2 hours
-  needs:
-    - job: "image:build"
-      optional: true
-  script:
-    - nox -s test_with_fft_and_pythran
-    - mkdir $COVERAGE_DIR
-    - cp -r .coverage/* $COVERAGE_DIR
-  artifacts:
-    paths:
-      - $COVERAGE_DIR/*
-    expire_in: 60 mins
 
 
 report_coverage:
@@ -166,6 +177,7 @@ report_coverage:
 
 
 test-release:examples:
+  <<: *check_nox_pdm
   stage: test-release
   needs:
     - job: "image:build"
@@ -178,6 +190,7 @@ test-release:examples:
 
 
 pages:
+  <<: *check_nox_pdm
   stage: doc
   needs:
     - job: "image:build"

.hgignore

@@ -89,3 +89,5 @@ doc/examples/htmlcov/*
 
 fluidsim/build_conf.txt
 .pdm-python
+
+.ruff_cache

.hgtags

@@ -41,3 +41,6 @@ a3c1c92a96b3832f5417f4f2dbc9dbfd1fe614ed 0.8.0rc3
 0e563c913a1e9745a5cf72839536fc26f0d86b18 0.8.2
 82e9ef86eab22b5136dbcc24e6f2af63ba8c9e1e 0.8.3
 dab5f225e02e41e6e53c18bfaafdd3e06e0db314 0.8.4
+bffedd445385e281fbfd2c56bca84d00b4358284 0.8.5
+0d09e831504bfdf93aebc7602465b1b89d550271 0.8.6
+13f0a4e4056494a61f2eeb3e0d56fbd8568587a3 0.9.0

.readthedocs.yml

@@ -8,7 +8,7 @@ build:
     - graphviz
   jobs:
     post_create_environment:
-      - pip install pdm==2.15.4 pip -U
+      - pip install pdm pip -U
     post_install:
       - pdm use -f $READTHEDOCS_VIRTUALENV_PATH
       - pdm sync -G doc -G fft -G test --no-self

AUTHORS.md

@@ -1,10 +1,10 @@
 # Authors
 
 Fluidsim has first been developed by
-[Pierre Augier](http://www.legi.grenoble-inp.fr/people/Pierre.Augier/) (CNRS
-researcher at [LEGI](http://www.legi.grenoble-inp.fr), Grenoble) at KTH
-(Stockholm) as a numerical code to solve fluid equations in a periodic
-two-dimensional space with pseudo-spectral methods.
+[Pierre Augier](http://www.legi.grenoble-inp.fr/people/Pierre.Augier/) (CNRS researcher
+at [LEGI](http://www.legi.grenoble-inp.fr), Grenoble) at KTH (Stockholm) as a numerical
+code to solve fluid equations in a periodic two-dimensional space with pseudo-spectral
+methods.
 
 Fluidsim has been greatly improved during Ashwin Vishnu PhD at KTH (Stockholm).
 
@@ -18,3 +18,5 @@ The main contributors are:
 - Antoine Bardant (LEGI)
 - [Vincent Labarre](https://www.researchgate.net/profile/Vincent-Labarre)
   ([OCA](https://www.oca.eu/fr/fluid))
+- Rodrigo Boiral-Lieuthier (LEGI)
+- Clovis Lambert (LEGI)