Merge branch 'PyPSA:master' into adding_solar_tracking_single_axis

.github/workflows/ci.yaml

@@ -31,7 +31,7 @@ jobs:
         os:
         - ubuntu-latest
         - macos-latest
-#        - windows-latest
+        - windows-latest
         inhouse:
         - stable
         - master

Snakefile

@@ -8,7 +8,7 @@ from os.path import normpath, exists
 from shutil import copyfile, move, rmtree
 from snakemake.utils import min_version
 
-min_version("8.5")
+min_version("8.11")
 
 from scripts._helpers import path_provider, copy_default_files, get_scenarios, get_rdir
 

envs/environment.yaml

@@ -20,7 +20,7 @@ dependencies:
 - openpyxl!=3.1.1
 - pycountry
 - seaborn
-- snakemake-minimal>=8.5
+- snakemake-minimal>=8.11
 - memory_profiler
 - yaml
 - pytables

scripts/add_existing_baseyear.py

@@ -310,7 +310,7 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas
                     n.madd(
                         "Generator",
                         new_capacity.index,
-                        suffix=" " + name_suffix,
+                        suffix=name_suffix,
                         bus=new_capacity.index,
                         carrier=generator,
                         p_nom=new_capacity,