Merge branch 'main' into ci/micromamba_update

sblauth · Jun 29, 2023 · 3738f2c · 3738f2c
2 parents 16915eb + 226704d
commit 3738f2c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 2 deletions.
diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update --fix-missing \
   && rm -rf /var/lib/apt/lists/*
 
 RUN conda install -c conda-forge mamba \
-  && mamba create -n cashocs -c conda-forge fenics=2019 meshio">=5.0.0" pytest">=7.0.0" gmsh">=4.8" "occt<=7.7.0" coverage">=6.1.0" mpich python=3.11 \
+  && mamba create -n cashocs -c conda-forge fenics=2019 meshio">=5.0.0" pytest">=7.0.0" gmsh">=4.8" "occt<=7.7.0" petsc"<=3.17.4" coverage">=6.1.0" mpich python=3.11 \
   && conda clean --all --yes
 
 

diff --git a/.github/workflows/test_demos.yml b/.github/workflows/test_demos.yml
@@ -29,6 +29,7 @@ jobs:
           pytest>=7.0.0
           gmsh>=4.8
           occt<=7.7.0
+          petsc<=3.17.4
           matplotlib
           python=3.11
 
@@ -67,6 +68,7 @@ jobs:
           pytest>=7.0.0
           gmsh>=4.8
           occt<=7.7.0
+          petsc<=3.17.4
           mpich
           matplotlib
           python=3.11

diff --git a/.github/workflows/tests_macos.yml b/.github/workflows/tests_macos.yml
@@ -33,6 +33,7 @@ jobs:
           pytest>=7.0.0
           gmsh>=4.8
           occt<=7.7.0
+          petsc"<=3.17.4"
 
     - name: Install package
       run: |

diff --git a/.github/workflows/tests_parallel.yml b/.github/workflows/tests_parallel.yml
@@ -36,6 +36,7 @@ jobs:
           pytest>=7.0.0
           gmsh>=4.8
           occt<=7.7.0
+          petsc<=3.17.4
           ${{ matrix.mpi }}
           python=${{ matrix.python-version }}
 

diff --git a/.github/workflows/tests_serial.yml b/.github/workflows/tests_serial.yml
@@ -33,6 +33,7 @@ jobs:
           pytest>=7.0.0
           gmsh>=4.8
           occt<=7.7.0
+          petsc<=3.17.4
           python=${{ matrix.python-version }}
 
     - name: Install package

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -47,7 +47,7 @@ repos:
 
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.3.0
+    rev: v1.4.1
     hooks:
       - id: mypy
         files: cashocs/