Merge branch 'topic/default/numpy2' into 'branch/default'

Topic/default/numpy2 See merge request fluiddyn/fluidsim!391
fluiddyn · Aug 17, 2024 · ace37d2 · ace37d2
2 parents 67cc221 + e5c9ccb
commit ace37d2
Show file tree

Hide file tree

Showing 8 changed files with 5,929 additions and 8,786 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - name: apt install

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -12,13 +12,13 @@ jobs:
         shell: bash -l {0}
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.10", "3.12"]
 
     steps:
     - uses: actions/checkout@v2
-    - uses: prefix-dev/setup-pixi@v0.4.1
+    - uses: prefix-dev/setup-pixi@v0.8.1
       with:
-        pixi-version: v0.11.1
+        pixi-version: v0.27.1
         cache: false
     - name: Tests
       run: |

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -189,7 +189,7 @@ pages:
     - mkdir -p public/$CI_COMMIT_REF_NAME
     - rsync -rvc --delete doc/_build/html/* public/$CI_COMMIT_REF_NAME/
     # This directory can become too large leading to error.
-    # It can be purged with the botton "Clear runner caches"
+    # It can be purged with the bottom "Clear runner caches"
     # in https://foss.heptapod.net/fluiddyn/fluidsim/-/pipelines
     - ls public
     - echo "CI_COMMIT_REF_NAME="$CI_COMMIT_REF_NAME

diff --git a/noxfile.py b/noxfile.py
@@ -149,7 +149,7 @@ def test_examples(session):
 def doc(session):
     """Build the documentation"""
     print_times = TimePrinter()
-    command = "pdm sync -G doc -G fft -G test --no-self"
+    command = "pdm sync -G doc -G fft -G test -G dev --no-self"
     session.run_always(*command.split(), external=True)
     print_times("pdm sync")
 

diff --git a/pdm.lock b/pdm.lock
diff --git a/pixi.lock b/pixi.lock
diff --git a/pixi.toml b/pixi.toml
@@ -16,7 +16,7 @@ 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.11"
+python = ">=3.9,<3.13"
 numpy = ">=1.26.3"
 transonic = ">=0.5.3"
 fluiddyn = ">=0.5.2"

diff --git a/pyproject.toml b/pyproject.toml
@@ -161,6 +161,8 @@ dev = [
     "pylint",
     "flit_core >=3.2,<4",
     "-e fluidsim-core @ file:///${PROJECT_ROOT}/lib",
+    # build dependency mpi4py
+    "cython >=3.0",
 ]
 
 [tool.pdm.scripts]