From f4b2fd3281dbe415f35bc01273e32741d646ff98 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 00:28:50 +0000 Subject: [PATCH 1/3] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 23.7.0 → 23.9.1](https://github.com/psf/black/compare/23.7.0...23.9.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 006673b9..42ade435 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -51,7 +51,7 @@ repos: # Formatting with "black" coding style - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 23.9.1 hooks: # Format Python files - id: black From 8b5476e273b22d559071abb26f8b36e9be1301ea Mon Sep 17 00:00:00 2001 From: chrstphtrs Date: Wed, 20 Sep 2023 19:33:44 +0200 Subject: [PATCH 2/3] Move all rule to main Snakefile --- Snakefile | 6 ++++++ rules/collect.smk | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Snakefile b/Snakefile index 0e783beb..4bdc40f3 100644 --- a/Snakefile +++ b/Snakefile @@ -46,6 +46,12 @@ wildcard_constraints: sector_opts="[-+a-zA-Z0-9\.\s]*", +rule all: + input: + RESULTS + "graphs/costs.pdf", + default_target: True + + include: "rules/common.smk" include: "rules/collect.smk" include: "rules/retrieve.smk" diff --git a/rules/collect.smk b/rules/collect.smk index 74f26ccb..0c713e5a 100644 --- a/rules/collect.smk +++ b/rules/collect.smk @@ -14,12 +14,6 @@ localrules: plot_networks, -rule all: - input: - RESULTS + "graphs/costs.pdf", - default_target: True - - rule cluster_networks: input: expand(RESOURCES + "networks/elec_s{simpl}_{clusters}.nc", **config["scenario"]), From 138584ecf7ded6bb67f1b796127db7cfd668c28f Mon Sep 17 00:00:00 2001 From: chrstphtrs Date: Fri, 22 Sep 2023 09:01:12 +0200 Subject: [PATCH 3/3] Move all rule down to other rules --- Snakefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Snakefile b/Snakefile index 4bdc40f3..bc77b0df 100644 --- a/Snakefile +++ b/Snakefile @@ -46,12 +46,6 @@ wildcard_constraints: sector_opts="[-+a-zA-Z0-9\.\s]*", -rule all: - input: - RESULTS + "graphs/costs.pdf", - default_target: True - - include: "rules/common.smk" include: "rules/collect.smk" include: "rules/retrieve.smk" @@ -72,6 +66,12 @@ if config["foresight"] == "myopic": include: "rules/solve_myopic.smk" +rule all: + input: + RESULTS + "graphs/costs.pdf", + default_target: True + + rule purge: message: "Purging generated resources, results and docs. Downloads are kept."