Skip to content

Commit

Permalink
Fix industry module import
Browse files Browse the repository at this point in the history
  • Loading branch information
timtroendle committed Jun 1, 2024
1 parent 263935e commit 4bb09da
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
14 changes: 2 additions & 12 deletions Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,6 @@ from snakemake.utils import validate, min_version, makedirs
configfile: "config/default.yaml"
validate(config, "config/schema.yaml")

# >>>>>> Include modules >>>>>>
# Industry
configfile: "modules/industry/config.yaml"
validate(config, "modules/industry/schema.yaml")

module module_industry:
snakefile: "modules/industry/industry.smk"
config: config["industry"]
use rule * from module_industry as module_industry_*
# <<<<<< Include modules <<<<<<


root_dir = config["root-directory"] + "/" if config["root-directory"] not in ["", "."] else ""
__version__ = open(f"{root_dir}VERSION").readlines()[0].strip()
test_dir = f"{root_dir}tests/"
Expand All @@ -38,6 +26,7 @@ include: "./rules/nuclear.smk"
include: "./rules/transport.smk"
include: "./rules/sync.smk"
include: "./rules/heat.smk"
include: "./rules/modules.smk"
min_version("8.10")
localrules: all, clean
wildcard_constraints:
Expand Down Expand Up @@ -83,6 +72,7 @@ onerror:
rule all:
message: "Generate euro-calliope pre-built models and run tests."
localrule: True
default_target: True
input:
"build/logs/continental/test.success",
"build/logs/national/test.success",
Expand Down
9 changes: 9 additions & 0 deletions rules/modules.smk
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Industry
configfile: "./modules/industry/config.yaml"
validate(config, "../modules/industry/schema.yaml")


module module_industry:
snakefile: "../modules/industry/industry.smk"
config: config["industry"]
use rule * from module_industry as module_industry_*

0 comments on commit 4bb09da

Please sign in to comment.