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

brownbaerchen · brownbaerchen · commit 6e0dd720be99 · 2025-02-15T14:25:56.000Z
diff --git a/etc/environment-petsc.yml b/etc/environment-petsc.yml
@@ -9,7 +9,7 @@ dependencies:
   - matplotlib>=3.0
   - dill>=0.2.6
   - mpich
-  - petsc4py
+  - petsc4py<3.22
   - mpi4py>=3.0.0
   - pip
   - pip:
diff --git a/pySDC/projects/SDC_showdown/environment.yml b/pySDC/projects/SDC_showdown/environment.yml
@@ -5,7 +5,7 @@ channels:
   - conda-forge
 dependencies:
   - mpich
-  - petsc4py
+  - petsc4py<3.22
   - matplotlib>=3.0
   - dill>=0.2.6
   - scipy>=0.17.1
