Merge pull request #2 from irm-codebase/local-testing

jnnr · web-flow · commit 9c054c152fb4 · 2025-11-04T11:32:14.000+01:00
Small fixes
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ post-process the results.
 First, create a new conda environment with the required dependencies:
 
 ```bash
-conda create -f environment.yaml
+conda env create -f environment.yaml
 conda activate module_integration
 ```
 
diff --git a/config/modules/module_geo_boundaries_NUTS0.yaml b/config/modules/module_geo_boundaries_NUTS0.yaml
@@ -1,5 +1,4 @@
 module_geo_boundaries_NUTS0:
-  buffer: 1
   crs:
     projected: "epsg:3857"
     geographic: "epsg:4326"
diff --git a/config/modules/module_geo_boundaries_NUTS2.yaml b/config/modules/module_geo_boundaries_NUTS2.yaml
@@ -1,5 +1,4 @@
 module_geo_boundaries_NUTS2:
-  buffer: 1
   crs:
     projected: "epsg:3857"
     geographic: "epsg:4326"
diff --git a/config/modules/module_geo_boundaries_NUTS3.yaml b/config/modules/module_geo_boundaries_NUTS3.yaml
@@ -1,5 +1,4 @@
 module_geo_boundaries_NUTS3:
-  buffer: 1
   crs:
     projected: "epsg:3857"
     geographic: "epsg:4326"
diff --git a/config/modules/module_powerplants.yaml b/config/modules/module_powerplants.yaml
@@ -100,7 +100,7 @@ module_powerplants:
       pumped_storage: 80
       gas_pp: 20
       reservoir: 80
-      pv_rooftop: 5
+      pv_rooftop: 25
       run_of_river: 80
       pv_open_field: 25
     retirement_delay_yr:
diff --git a/environment.yaml b/environment.yaml
@@ -1,13 +1,14 @@
 name: module_integration
 channels:
+    - conda-forge/label/calliope_dev
     - conda-forge
     - bioconda
 dependencies:
     - python=3.12
     - flake8=3.8.3
     - snakemake-minimal=8.18
     # - graphviz=2.50.0
-    - calliope=0.7.0.dev5
+    - calliope=0.7.0dev5
     - pandas
     - numpy<2.0.0
     - xlrd
diff --git a/rules/0_module_geo_boundaries.smk b/rules/0_module_geo_boundaries.smk
@@ -42,7 +42,7 @@ module module_geo_boundaries:
         github(
             "calliope-project/module_geo_boundaries",
             path="workflow/Snakefile",
-            tag="main",
+            tag="v0.1.5",
         )
     config:
         config["module_geo_boundaries_NUTS3"]
diff --git a/rules/0_module_pv_wind.smk b/rules/0_module_pv_wind.smk
@@ -2,13 +2,11 @@ configfile: "config/modules/module_pv_wind.yaml"
 
 module module_pv_wind:
     snakefile:
-        "../../module_pv_wind/workflow/Snakefile"
-
-        # github(
-        #     "calliope-project/module_pv_wind",
-        #     path="workflow/Snakefile",
-        #     tag="cd3c2b4",
-        # )
+        github(
+            "calliope-project/module_pv_wind",
+            path="workflow/Snakefile",
+            branch="feature-module-setup",
+        )
     config: config["module_pv_wind"]
     prefix: "results/module_pv_wind"
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`module_geo_boundaries_NUTS0:`
`2`		`- buffer: 1`
`3`	`2`	`crs:`
`4`	`3`	`projected: "epsg:3857"`
`5`	`4`	`geographic: "epsg:4326"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`module_geo_boundaries_NUTS2:`
`2`		`- buffer: 1`
`3`	`2`	`crs:`
`4`	`3`	`projected: "epsg:3857"`
`5`	`4`	`geographic: "epsg:4326"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`module_geo_boundaries_NUTS3:`
`2`		`- buffer: 1`
`3`	`2`	`crs:`
`4`	`3`	`projected: "epsg:3857"`
`5`	`4`	`geographic: "epsg:4326"`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ module module_geo_boundaries:`
`42`	`42`	`github(`
`43`	`43`	`"calliope-project/module_geo_boundaries",`
`44`	`44`	`path="workflow/Snakefile",`
`45`		`- tag="main",`
	`45`	`+ tag="v0.1.5",`
`46`	`46`	`)`
`47`	`47`	`config:`
`48`	`48`	`config["module_geo_boundaries_NUTS3"]`