Merge branch 'master' into refactor-copy-config-get-rdir

rules/retrieve.smk

@@ -115,7 +115,7 @@ if config["enable"]["retrieve"] and config["enable"].get(
             mem_mb=5000,
         retries: 2
         run:
-            move(input[0], output[0])
+            copyfile(input[0], output[0])
             validate_checksum(output[0], input[0])
 
 

scripts/add_brownfield.py

@@ -145,7 +145,7 @@ def disable_grid_expansion_if_limit_hit(n):
         for name, glc in glcs.iterrows():
             total_expansion = (
                 (
-                    n.lines.query("p_nom_extendable")
+                    n.lines.query("s_nom_extendable")
                     .eval(f"s_nom_min * {cols[limit_type]}")
                     .sum()
                 )

scripts/build_hydro_profile.py

@@ -202,9 +202,10 @@ if __name__ == "__main__":
 
     contained_years = pd.date_range(freq="YE", **snakemake.params.snapshots).year
     norm_year = config_hydro.get("eia_norm_year")
+    missing_years = contained_years.difference(eia_stats.index)
     if norm_year:
         eia_stats.loc[contained_years] = eia_stats.loc[norm_year]
-    elif missing_years := eia_stats.index.difference(contained_years):
+    elif missing_years.any():
         eia_stats.loc[missing_years] = eia_stats.median()
 
     inflow = cutout.runoff(

scripts/retrieve_cost_data.py

@@ -26,7 +26,7 @@ if __name__ == "__main__":
 
     version = snakemake.params.version
     if "/" in version:
-        baseurl = f"https://raw.githubusercontent.com/{version}/outputs"
+        baseurl = f"https://raw.githubusercontent.com/{version}/outputs/"
     else:
         baseurl = f"https://raw.githubusercontent.com/PyPSA/technology-data/{version}/outputs/"
     filepath = Path(snakemake.output[0])