change from config.yaml to config.de.yaml

Author: lindnemi

.github/workflows/validate.yaml

@@ -23,7 +23,7 @@ jobs:
       with:
         step: run-self-hosted-validation
         env_file: envs/environment.yaml
-        snakemake_config: config/config.yaml
+        snakemake_config: config/config.de.yaml
         pre_command: "build_scenarios -f"
         main_command: "ariadne_all"
       env:
@@ -48,7 +48,7 @@ jobs:
     - uses: PyPSA/[email protected]
       with:
         step: create-comment
-        snakemake_config: config/config.yaml
+        snakemake_config: config/config.de.yaml
         # The path starting from prefix in config
         # For plot results/<prefix>/<scenario>/<plot_name>.png pass
         # <scenario>/<plot_name>.png

.gitignore

@@ -30,12 +30,9 @@ doc/_build
 /scripts/create_scenarios.py
 /config/create_scenarios.py
 
-config/config.yaml
 config/scenarios.yaml
 config/scenarios.automated.yaml
 
-config/config.yaml
-
 dconf
 /data/links_p_nom.csv
 /data/*totals.csv

Makefile

@@ -74,13 +74,12 @@ clean-tests:
 
 # Removes all created files except for large cutout files (similar to fresh clone)
 reset:
-	@echo "Do you really wanna continue? This will remove config/config.yaml, logs, resources, benchmarks, results, and .snakemake directories (y/n): " && \
+	@echo "Do you really wanna continue? This will remove logs, resources, benchmarks, results, and .snakemake directories (y/n): " && \
 	read ans && [ $${ans} = y ] && ( \
 		rm -r ./logs || true; \
 		rm -r ./resources || true; \
 		rm -r ./benchmarks || true; \
 		rm -r ./results || true; \
 		rm -r ./.snakemake || true; \
-		rm ./config/config.yaml || true; \
 		echo "Reset completed." \
 	) || echo "Reset cancelled."

Snakefile

@@ -13,20 +13,15 @@ min_version("8.11")
 
 from scripts._helpers import (
     path_provider,
-    copy_default_files,
     get_scenarios,
     get_rdir,
     get_shadow,
 )
 
 
-copy_default_files(workflow)
-
-
 configfile: "config/config.default.yaml"
 configfile: "config/plotting.default.yaml"
-configfile: "config/config.yaml"
-configfile: "config/config.personal.yaml"
+configfile: "config/config.de.yaml"
 
 
 run = config["run"]

config/config.yaml config/config.de.yamlconfig/config.yaml renamed to config/config.de.yaml

@@ -158,23 +158,6 @@ if config["foresight"] == "perfect":
             "../scripts/plot_power_network_perfect.py"
 
 
-rule copy_config:
-    params:
-        RDIR=RDIR,
-        config=lambda wildcards: (
-            scenario_config(wildcards.run) if "run" in wildcards else config
-        ),
-    output:
-        RESULTS + "config.yaml",
-    threads: 1
-    resources:
-        mem_mb=1000,
-    conda:
-        "../envs/environment.yaml"
-    script:
-        "../scripts/copy_config.py"
-
-
 rule make_summary:
     input:
         network=RESULTS

config/config.personal.yaml

@@ -10,9 +10,7 @@
 import re
 import time
 from functools import partial, wraps
-from os.path import exists
 from pathlib import Path
-from shutil import copyfile
 from tempfile import NamedTemporaryFile
 from typing import Callable, Union
 
@@ -32,18 +30,6 @@
 REGION_COLS = ["geometry", "name", "x", "y", "country"]
 
 
-def copy_default_files(workflow):
-    default_files = {
-        "config/config.default.yaml": "config/config.yaml",
-        "config/scenarios.template.yaml": "config/scenarios.yaml",
-    }
-    for template, target in default_files.items():
-        target = os.path.join(workflow.current_basedir, target)
-        template = os.path.join(workflow.current_basedir, template)
-        if not exists(target) and exists(template):
-            copyfile(template, target)
-
-
 def get_scenarios(run):
     scenario_config = run.get("scenarios", {})
     if run["name"] and scenario_config.get("enable"):