Merge branch 'main' into pre-commit-ci-update-config

calliope-project · Sep 2, 2024 · f37acbf · f37acbf
2 parents fa4cb06 + d246721
commit f37acbf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/wrappers/atlite/availability/environment.yaml b/wrappers/atlite/availability/environment.yaml
@@ -3,5 +3,5 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - atlite = 0.2.13
-  - numpy = 1.23
+  - atlite = 0.2.14
+  - numpy = 1.23 # keep until https://github.com/PyPSA/atlite/issues/363 is fixed
diff --git a/wrappers/atlite/cutout/environment.yaml b/wrappers/atlite/cutout/environment.yaml
@@ -3,5 +3,4 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  # FIXME: keep until https://github.com/PyPSA/atlite/issues/371 is fixed!
-  - atlite = 0.2.10
+  - atlite = 0.2.14
diff --git a/wrappers/atlite/cutout/test/Snakefile b/wrappers/atlite/cutout/test/Snakefile
@@ -6,7 +6,7 @@ rule atlite_cutout:
         plot_cutout = "results/plot_cutout.png"
     params:
         time = "2019-05-02",
-        features = ["height", "wind", "influx", "temperature", "runoff"],
+        features = ["runoff"],
         offset_degrees = 0,
         module = ["era5"],
     wrapper: "file:../"
diff --git a/wrappers/atlite/pv/environment.yaml b/wrappers/atlite/pv/environment.yaml
@@ -3,4 +3,4 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - atlite = 0.2.13
+  - atlite = 0.2.14
diff --git a/wrappers/atlite/uniform-layout/environment.yaml b/wrappers/atlite/uniform-layout/environment.yaml
@@ -3,4 +3,4 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - atlite = 0.2.13
+  - atlite = 0.2.14