From 97bdbe636cddc3cd1ffc51d01bc09014291abdda Mon Sep 17 00:00:00 2001
From: Fabian <fab.hof@gmx.de>
Date: Fri, 21 Apr 2023 11:05:18 +0200
Subject: [PATCH] follow-up: rename configs to config

---
 .github/workflows/ci.yaml | 6 +++---
 Snakefile                 | 6 +++---
 rules/postprocess.smk     | 4 ++--
 rules/solve_myopic.smk    | 2 +-
 rules/solve_overnight.smk | 4 ++--
 scripts/copy_config.py    | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2e7de2d3..f0cdfca1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -103,9 +103,9 @@ jobs:
       run: |
         conda activate pypsa-eur
         conda list
-        snakemake -call solve_elec_networks --configfile configs/test/config.electricity.yaml --rerun-triggers=mtime
-        snakemake -call all --configfile configs/test/config.overnight.yaml --rerun-triggers=mtime
-        snakemake -call all --configfile configs/test/config.myopic.yaml --rerun-triggers=mtime
+        snakemake -call solve_elec_networks --configfile config/test/config.electricity.yaml --rerun-triggers=mtime
+        snakemake -call all --configfile config/test/config.overnight.yaml --rerun-triggers=mtime
+        snakemake -call all --configfile config/test/config.myopic.yaml --rerun-triggers=mtime
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v3
diff --git a/Snakefile b/Snakefile
index 48529908..27ed4dfb 100644
--- a/Snakefile
+++ b/Snakefile
@@ -14,11 +14,11 @@ from snakemake.utils import min_version
 min_version("7.7")
 
 
-if not exists("configs/config.yaml"):
-    copyfile("configs/config.default.yaml", "configs/config.yaml")
+if not exists("config/config.yaml"):
+    copyfile("config/config.default.yaml", "config/config.yaml")
 
 
-configfile: "configs/config.yaml"
+configfile: "config/config.yaml"
 
 
 COSTS = f"data/costs_{config['costs']['year']}.csv"
diff --git a/rules/postprocess.smk b/rules/postprocess.smk
index d5095358..fae0f856 100644
--- a/rules/postprocess.smk
+++ b/rules/postprocess.smk
@@ -37,7 +37,7 @@ rule copy_config:
     params:
         RDIR=RDIR,
     output:
-        RESULTS + "configs/config.yaml",
+        RESULTS + "config/config.yaml",
     threads: 1
     resources:
         mem_mb=1000,
@@ -51,7 +51,7 @@ rule copy_config:
 
 rule copy_conda_env:
     output:
-        RESULTS + "configs/environment.yaml",
+        RESULTS + "config/environment.yaml",
     threads: 1
     resources:
         mem_mb=500,
diff --git a/rules/solve_myopic.smk b/rules/solve_myopic.smk
index 041bee84..f10d8157 100644
--- a/rules/solve_myopic.smk
+++ b/rules/solve_myopic.smk
@@ -79,7 +79,7 @@ rule solve_sector_network_myopic:
         network=RESULTS
         + "prenetworks-brownfield/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
         costs="data/costs_{planning_horizons}.csv",
-        config=RESULTS + "configs/config.yaml",
+        config=RESULTS + "config/config.yaml",
     output:
         RESULTS
         + "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
diff --git a/rules/solve_overnight.smk b/rules/solve_overnight.smk
index c39662ec..c2e103e5 100644
--- a/rules/solve_overnight.smk
+++ b/rules/solve_overnight.smk
@@ -9,8 +9,8 @@ rule solve_sector_network:
         network=RESULTS
         + "prenetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
         costs="data/costs_{}.csv".format(config["costs"]["year"]),
-        config=RESULTS + "configs/config.yaml",
-        #env=RDIR + 'configs/environment.yaml',
+        config=RESULTS + "config/config.yaml",
+        #env=RDIR + 'config/environment.yaml',
     output:
         RESULTS
         + "postnetworks/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}_{planning_horizons}.nc",
diff --git a/scripts/copy_config.py b/scripts/copy_config.py
index 084601ed..79d2e32b 100644
--- a/scripts/copy_config.py
+++ b/scripts/copy_config.py
@@ -12,7 +12,7 @@ from shutil import copy
 import yaml
 
 files = {
-    "configs/config.yaml": "config.yaml",
+    "config/config.yaml": "config.yaml",
     "Snakefile": "Snakefile",
     "scripts/solve_network.py": "solve_network.py",
     "scripts/prepare_sector_network.py": "prepare_sector_network.py",
@@ -24,7 +24,7 @@ if __name__ == "__main__":
 
         snakemake = mock_snakemake("copy_config")
 
-    basepath = Path(f"results/{snakemake.params.RDIR}configs/")
+    basepath = Path(f"results/{snakemake.params.RDIR}config/")
 
     for f, name in files.items():
         copy(f, basepath / name)