From 8d9afb0eb048f6d0d3c4370c84c29159862b4bec Mon Sep 17 00:00:00 2001 From: Philipp Glaum Date: Tue, 19 Mar 2024 08:28:27 +0100 Subject: [PATCH 1/2] solve_electricity.smk:replace "minimal" by "shallow" --- rules/solve_electricity.smk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/solve_electricity.smk b/rules/solve_electricity.smk index f24119b9..389687a0 100644 --- a/rules/solve_electricity.smk +++ b/rules/solve_electricity.smk @@ -31,7 +31,7 @@ rule solve_network: mem_mb=memory, runtime=config_provider("solving", "runtime", default="6h"), shadow: - "minimal" + "shallow" conda: "../envs/environment.yaml" script: @@ -62,7 +62,7 @@ rule solve_operations_network: mem_mb=(lambda w: 10000 + 372 * int(w.clusters)), runtime=config_provider("solving", "runtime", default="6h"), shadow: - "minimal" + "shallow" conda: "../envs/environment.yaml" script: From 651e28775ecbe50f9918ea18bbb06edc57d58ad9 Mon Sep 17 00:00:00 2001 From: Koen van Greevenbroek Date: Tue, 19 Mar 2024 13:00:16 +0000 Subject: [PATCH 2/2] Use raw strings to avoid illegal backslash warnings python 12 --- Snakefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Snakefile b/Snakefile index 58cb6677..ca1b72cc 100644 --- a/Snakefile +++ b/Snakefile @@ -56,9 +56,9 @@ localrules: wildcard_constraints: simpl="[a-zA-Z0-9]*", clusters="[0-9]+(m|c)?|all", - ll="(v|c)([0-9\.]+|opt)", - opts="[-+a-zA-Z0-9\.]*", - sector_opts="[-+a-zA-Z0-9\.\s]*", + ll=r"(v|c)([0-9\.]+|opt)", + opts=r"[-+a-zA-Z0-9\.]*", + sector_opts=r"[-+a-zA-Z0-9\.\s]*", include: "rules/common.smk" @@ -127,7 +127,7 @@ rule dag: conda: "envs/environment.yaml" shell: - """ + r""" snakemake --rulegraph all | sed -n "/digraph/,\$p" > {output.dot} dot -Tpdf -o {output.pdf} {output.dot} dot -Tpng -o {output.png} {output.dot}