Merge remote-tracking branch 'upstream/master' into paper_stuff

Parallel-in-Time · Oct 16, 2023 · 7ceec41 · 7ceec41
2 parents b7ea7b1 + cb2b0ff
commit 7ceec41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml
@@ -26,6 +26,8 @@ jobs:
         uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: ${{ env.YML }}
+          create-args: >-
+              python=3.10
 
       - name: Code reformatting with black
         run: |

diff --git a/etc/environment-petsc.yml b/etc/environment-petsc.yml
@@ -8,9 +8,9 @@ dependencies:
   - matplotlib>=3.0
   - dill>=0.2.6
   - mpich
-  - petsc4py>=3.10.0
+  - petsc4py<3.20
   - mpi4py>=3.0.0
   - pytest
   - pytest-cov
   - pytest-timeout
-  - pytest-order
+  - pytest-order