minor fixes

Snakefile

@@ -12,7 +12,7 @@ configfile: "config.yaml"
 
 
 wildcard_constraints:
-    year="[0-9]*",
+    weather_year="[0-9]*",
     lv="[a-z0-9\.]+",
     simpl="[a-zA-Z0-9]*",
     clusters="[0-9]+m?",

config.default.yaml

@@ -65,8 +65,6 @@ snapshots:
   end: "2014-01-01"
   closed: left # end is not inclusive
 
-countries: ['AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'ME', 'MK', 'NL', 'NO', 'PL', 'PT', 'RO', 'RS', 'SE', 'SI', 'SK']
-
 atlite:
   cutout: ../pypsa-eur/cutouts/europe-2013-era5.nc
 

scripts/build_population_layouts.py

@@ -12,7 +12,10 @@ from vresutils import shapes as vshapes
 if __name__ == '__main__':
     if 'snakemake' not in globals():
         from helper import mock_snakemake
-        snakemake = mock_snakemake('build_population_layouts', year='')
+        snakemake = mock_snakemake(
+            'build_population_layouts',
+            weather_year='',
+        )
 
     year = snakemake.wildcards.weather_year
     cutout_config = snakemake.config['atlite']['cutout']