Merge branch 'main' into numerics

Deltares · Oct 5, 2023 · a9d2172 · a9d2172
2 parents ea1fa6e + 544337b
commit a9d2172
Show file tree

Hide file tree

Showing 14 changed files with 3,570 additions and 3,455 deletions.
diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml
@@ -31,7 +31,7 @@ jobs:
           pixi-version: "v0.3.0"
           cache: true
       - name: Prepare pixi
-        run: pixi run post-install-without-pre-commit
+        run: pixi run install-without-pre-commit
       - name: Prepare model input
         run: |
           pixi run generate-testmodels

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -42,7 +42,7 @@ jobs:
           pixi-version: "v0.3.0"
           cache: true
       - name: Prepare pixi
-        run: pixi run post-install-without-pre-commit
+        run: pixi run install-without-pre-commit
 
       - name: Check Quarto installation and all engines
         run: pixi run quarto-check

diff --git a/.github/workflows/python_lint.yml b/.github/workflows/python_lint.yml
@@ -21,7 +21,7 @@ jobs:
           pixi-version: "latest"
           cache: true
       - name: Prepare pixi
-        run: pixi run post-install-without-pre-commit
+        run: pixi run install-without-pre-commit
       - name: Run mypy on python/ribasim
         run: |
           pixi run mypy-ribasim-python

diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
@@ -34,7 +34,7 @@ jobs:
           pixi-version: "v0.3.0"
           cache: true
       - name: Prepare pixi
-        run: pixi run post-install-without-pre-commit
+        run: pixi run install-without-pre-commit
 
       - name: Run tests
         run: pixi run test-ribasim-python-cov

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,12 +14,12 @@ repos:
         exclude: '.teamcity'
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.286
+    rev: v0.0.291
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 23.9.1
     hooks:
       - id: black
       - id: black-jupyter
@@ -28,6 +28,6 @@ repos:
     hooks:
       - id: nbstripout
   - repo: https://github.com/crate-ci/typos
-    rev: v1.16.8
+    rev: v1.16.15
     hooks:
       - id: typos
diff --git a/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_Ribasim_TestRibasimCliWindows.xml b/.teamcity/Ribasim_Ribasim/buildTypes/Ribasim_Ribasim_TestRibasimCliWindows.xml
@@ -15,8 +15,7 @@
     <build-runners>
       <runner id="RUNNER_1501" name="Set up pixi" type="simpleRunner">
         <parameters>
-          <param name="script.content"><![CDATA[pixi install
-pixi run post-install]]></param>
+          <param name="script.content"><![CDATA[pixi run install]]></param>
           <param name="teamcity.build.workingDir" value="ribasim" />
           <param name="teamcity.step.mode" value="default" />
           <param name="use.custom.script" value="true" />
@@ -84,4 +83,3 @@ pip install --no-deps "python/ribasim_testmodels"]]></param>
     <cleanup />
   </settings>
 </build-type>
-