diff --git a/Snakefile b/Snakefile index 7487b3d5..78a28373 100644 --- a/Snakefile +++ b/Snakefile @@ -97,6 +97,8 @@ rule all: rule create_scenarios: output: config["run"]["scenarios"]["file"], + conda: + "envs/retrieve.yaml" script: "config/create_scenarios.py" diff --git a/config/test/config.scenarios.electricity.yaml b/config/test/config.scenarios.yaml similarity index 95% rename from config/test/config.scenarios.electricity.yaml rename to config/test/config.scenarios.yaml index dde138ed..8ecbb91b 100644 --- a/config/test/config.scenarios.electricity.yaml +++ b/config/test/config.scenarios.yaml @@ -10,7 +10,7 @@ run: - test-elec-no-onshore-wind scenarios: enable: true - file: "config/test/scenarios.electricity.yaml" + file: "config/test/scenarios.yaml" disable_progressbar: true shared_resources: base shared_cutouts: true diff --git a/config/test/scenarios.electricity.yaml b/config/test/scenarios.yaml similarity index 100% rename from config/test/scenarios.electricity.yaml rename to config/test/scenarios.yaml diff --git a/test.sh b/test.sh index a40276b8..c36ce5cd 100755 --- a/test.sh +++ b/test.sh @@ -5,4 +5,5 @@ 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 && \ -snakemake -call all --configfile config/test/config.perfect.yaml --rerun-triggers=mtime +snakemake -call all --configfile config/test/config.perfect.yaml --rerun-triggers=mtime && \ +snakemake -call all --configfile config/test/config.scenarios.yaml --rerun-triggers=mtime -n && \