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

brownbaerchen · brownbaerchen · commit 22765c5f620e · 2024-09-27T09:17:15.000+02:00
diff --git a/docs/contrib/06_new_project.md b/docs/contrib/06_new_project.md
@@ -22,7 +22,6 @@ The file needs to be named `environment.yml` and needs to follow the structure s
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy
   - pip
diff --git a/etc/environment-base.yml b/etc/environment-base.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy
   - scipy>=0.17.1
diff --git a/etc/environment-cupy.yml b/etc/environment-cupy.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy>=1.15.4
   - scipy>=0.17.1
diff --git a/etc/environment-fenics.yml b/etc/environment-fenics.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy>=1.15.4
   - scipy>=0.17.1
diff --git a/etc/environment-lint.yml b/etc/environment-lint.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - black
   - ruff
diff --git a/etc/environment-mpi4py.yml b/etc/environment-mpi4py.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy>=1.15.4
   - scipy>=0.17.1
diff --git a/etc/environment-petsc.yml b/etc/environment-petsc.yml
@@ -3,14 +3,13 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy>=1.15.4
   - scipy>=0.17.1
   - matplotlib>=3.0
   - dill>=0.2.6
   - mpich
-  - petsc4py<3.20
+  - petsc4py
   - mpi4py>=3.0.0
   - pip
   - pip:
diff --git a/etc/environment-postprocess.yml b/etc/environment-postprocess.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - coverage[toml]
   - sphinx
diff --git a/etc/environment-pytorch.yml b/etc/environment-pytorch.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy
   - scipy>=0.17.1
diff --git a/etc/environment-tests.yml b/etc/environment-tests.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - pytest
   - pytest-benchmark
diff --git a/pySDC/playgrounds/12th_PinT_Workshop/environment-tutorial.yml b/pySDC/playgrounds/12th_PinT_Workshop/environment-tutorial.yml
@@ -3,7 +3,6 @@
 name: pySDC_tutorial
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy>=1.15.4
   - scipy>=0.17.1
diff --git a/pySDC/projects/AllenCahn_Bayreuth/environment.yml b/pySDC/projects/AllenCahn_Bayreuth/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - mpi4py>=3.0.0
   - mpi4py-fft>=2.0.2
diff --git a/pySDC/projects/AsympConv/environment.yml b/pySDC/projects/AsympConv/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - matplotlib>=3.0
   - scipy>=0.17.1
diff --git a/pySDC/projects/DAE/environment.yml b/pySDC/projects/DAE/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy
   - scipy>=0.17.1
diff --git a/pySDC/projects/FastWaveSlowWave/environment.yml b/pySDC/projects/FastWaveSlowWave/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy
   - matplotlib>=3.0
diff --git a/pySDC/projects/Hamiltonian/environment.yml b/pySDC/projects/Hamiltonian/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - dill>=0.2.6
   - numpy
diff --git a/pySDC/projects/Monodomain/etc/environment-monodomain.yml b/pySDC/projects/Monodomain/etc/environment-monodomain.yml
@@ -3,7 +3,6 @@
 name: pySDC_monodomain
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - python
   - numpy
diff --git a/pySDC/projects/PinTSimE/environment.yml b/pySDC/projects/PinTSimE/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy
   - scipy>=0.17.1
diff --git a/pySDC/projects/RDC/environment.yml b/pySDC/projects/RDC/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy
   - dill>=0.2.6
diff --git a/pySDC/projects/Resilience/environment.yml b/pySDC/projects/Resilience/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - mpi4py>=3.0.0
   - mpi4py-fft>=2.0.2
diff --git a/pySDC/projects/SDC_showdown/environment.yml b/pySDC/projects/SDC_showdown/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - petsc4py<3.20
   - matplotlib>=3.0
diff --git a/pySDC/projects/Second_orderSDC/environment.yml b/pySDC/projects/Second_orderSDC/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy
   - numba>=0.35
diff --git a/pySDC/projects/TOMS/environment.yml b/pySDC/projects/TOMS/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - dill>=0.2.6
   - matplotlib>=3.0
diff --git a/pySDC/projects/matrixPFASST/environment.yml b/pySDC/projects/matrixPFASST/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy
   - scipy>=0.17.1
diff --git a/pySDC/projects/parallelSDC/environment.yml b/pySDC/projects/parallelSDC/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy>=1.15.4
   - scipy>=0.17.1
diff --git a/pySDC/projects/parallelSDC_reloaded/environment.yml b/pySDC/projects/parallelSDC_reloaded/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - numpy
   - matplotlib>=3.0
diff --git a/pySDC/projects/soft_failure/environment.yml b/pySDC/projects/soft_failure/environment.yml
@@ -3,7 +3,6 @@
 name: pySDC
 channels:
   - conda-forge
-  - defaults
 dependencies:
   - dill>=0.2.6
   - numpy
