Skip to content

Commit

Permalink
snakefile: use config.default as basis
Browse files Browse the repository at this point in the history
ci: use tutorial config as secondary config
  • Loading branch information
FabianHofmann committed Jul 3, 2024
1 parent e0840f5 commit ed3f065
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@

test:
set -e
snakemake run_all_scenarios -c1 -F --configfile test/config.custom.yaml
snakemake solve_all_networks -call -F --configfile test/config.tutorial_noprogress.yaml
snakemake solve_all_networks_monte -call -F --configfile test/config.monte_carlo.yaml
snakemake solve_all_networks -call -F --configfile test/config.landlock.yaml
snakemake solve_all_networks -call --configfile config.tutorial.yaml
snakemake solve_all_networks -call --configfile config.tutorial.yaml test/config.custom.yaml
snakemake solve_all_networks -call --configfile config.tutorial.yaml configs/scenarios/config.NG.yaml
snakemake solve_all_networks -call --configfile config.tutorial.yaml test/config.tutorial_noprogress.yaml
snakemake solve_all_networks_monte -call --configfile config.tutorial.yaml test/config.monte_carlo.yaml
snakemake solve_all_networks -call --configfile config.tutorial.yaml test/config.landlock.yaml
echo "All tests completed successfully."

setup:
Expand Down
8 changes: 4 additions & 4 deletions Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ from pathlib import Path

HTTP = HTTPRemoteProvider()

if not exists("config.yaml"):
copyfile("config.tutorial.yaml", "config.yaml")


configfile: "config.default.yaml"
configfile: "config.yaml"
configfile: "configs/bundle_config.yaml"


# configfile: "configs/bundle_config.yaml"


config.update({"git_commit": get_last_commit_message(".")})
Expand Down
3 changes: 0 additions & 3 deletions configs/scenarios/config.NG.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,3 @@ countries:

scenario:
clusters: [5]

enable:
retrieve_databundle: false

0 comments on commit ed3f065

Please sign in to comment.