Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec

scripts/_helpers.py

@@ -295,7 +295,7 @@ def get_aggregation_strategies(aggregation_strategies):
     return bus_strategies, generator_strategies
 
 
-def mock_snakemake(rulename, **wildcards):
+def mock_snakemake(rulename, configfiles=[], **wildcards):
     """
     This function is expected to be executed from the 'scripts'-directory of '
     the snakemake project. It returns a snakemake.script.Snakemake object,
@@ -307,6 +307,8 @@ def mock_snakemake(rulename, **wildcards):
     ----------
     rulename: str
         name of the rule for which the snakemake object should be generated
+    configfiles: list, str
+        list of configfiles to be used to update the config
     **wildcards:
         keyword arguments fixing the wildcards. Only necessary if wildcards are
         needed.
@@ -319,46 +321,66 @@ def mock_snakemake(rulename, **wildcards):
     from snakemake.script import Snakemake
 
     script_dir = Path(__file__).parent.resolve()
-    assert (
+    root_dir = script_dir.parent
-        Path.cwd().resolve() == script_dir
-    ), f"mock_snakemake has to be run from the repository scripts directory {script_dir}"
-    os.chdir(script_dir.parent)
-    for p in sm.SNAKEFILE_CHOICES:
-        if os.path.exists(p):
-            snakefile = p
-            break
-    kwargs = dict(rerun_triggers=[]) if parse(sm.__version__) > Version("7.7.0") else {}
-    workflow = sm.Workflow(snakefile, overwrite_configfiles=[], **kwargs)
-    workflow.include(snakefile)
-    workflow.global_resources = {}
-    rule = workflow.get_rule(rulename)
-    dag = sm.dag.DAG(workflow, rules=[rule])
-    wc = Dict(wildcards)
-    job = sm.jobs.Job(rule, dag, wc)
 
-    def make_accessable(*ios):
+    user_in_script_dir = Path.cwd().resolve() == script_dir
-        for io in ios:
+    if user_in_script_dir:
-            for i in range(len(io)):
+        os.chdir(root_dir)
-                io[i] = os.path.abspath(io[i])
+    elif Path.cwd().resolve() != root_dir:
+        raise RuntimeError(
+            "mock_snakemake has to be run from the repository root"
+            f" {root_dir} or scripts directory {script_dir}"
+        )
+    try:
+        for p in sm.SNAKEFILE_CHOICES:
+            if os.path.exists(p):
+                snakefile = p
+                break
+        kwargs = (
+            dict(rerun_triggers=[]) if parse(sm.__version__) > Version("7.7.0") else {}
+        )
+        workflow = sm.Workflow(snakefile, **kwargs)
+        workflow.include(snakefile)
 
-    make_accessable(job.input, job.output, job.log)
+        if isinstance(configfiles, str):
-    snakemake = Snakemake(
+            configfiles = [configfiles]
-        job.input,
+        if configfiles:
-        job.output,
+            for f in configfiles:
-        job.params,
+                if not os.path.exists(f):
-        job.wildcards,
+                    raise FileNotFoundError(f"Config file {f} does not exist.")
-        job.threads,
+                workflow.configfile(f)
-        job.resources,
-        job.log,
-        job.dag.workflow.config,
-        job.rule.name,
-        None,
-    )
-    # create log and output dir if not existent
-    for path in list(snakemake.log) + list(snakemake.output):
-        Path(path).parent.mkdir(parents=True, exist_ok=True)
 
-    os.chdir(script_dir)
+        workflow.global_resources = {}
+        rule = workflow.get_rule(rulename)
+        dag = sm.dag.DAG(workflow, rules=[rule])
+        wc = Dict(wildcards)
+        job = sm.jobs.Job(rule, dag, wc)
+
+        def make_accessable(*ios):
+            for io in ios:
+                for i in range(len(io)):
+                    io[i] = os.path.abspath(io[i])
+
+        make_accessable(job.input, job.output, job.log)
+        snakemake = Snakemake(
+            job.input,
+            job.output,
+            job.params,
+            job.wildcards,
+            job.threads,
+            job.resources,
+            job.log,
+            job.dag.workflow.config,
+            job.rule.name,
+            None,
+        )
+        # create log and output dir if not existent
+        for path in list(snakemake.log) + list(snakemake.output):
+            Path(path).parent.mkdir(parents=True, exist_ok=True)
+
+    finally:
+        if user_in_script_dir:
+            os.chdir(script_dir)
     return snakemake
 
 

scripts/add_brownfield.py

@@ -3,7 +3,9 @@
 #
 # SPDX-License-Identifier: MIT
 
-"""Prepares brownfield data from previous planning horizon."""
+"""
+Prepares brownfield data from previous planning horizon.
+"""
 
 import logging
 

scripts/add_existing_baseyear.py

@@ -3,7 +3,10 @@
 #
 # SPDX-License-Identifier: MIT
 
-"""Adds existing power and heat generation capacities for initial planning horizon."""
+"""
+Adds existing power and heat generation capacities for initial planning
+horizon.
+"""
 
 import logging
 

scripts/build_retro_cost.py

@@ -5,9 +5,9 @@
 # SPDX-License-Identifier: MIT
 
 """
-This script calculates the space heating savings through better
+This script calculates the space heating savings through better insulation of
-insulation of the thermal envelope of a building and corresponding costs for
+the thermal envelope of a building and corresponding costs for different
-different building types in different countries.
+building types in different countries.
 
 Methodology
 -----------