Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Harmonise wildcards #1223

Merged
merged 10 commits into from
Dec 20, 2024
+69 −69
Merged

Harmonise wildcards #1223

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a392df6
Rename the sector test file
ekatef Nov 29, 2024
1cc06d2
Change a name of the config of the sector test
ekatef Nov 29, 2024
bf33ab2
Fix a comment
ekatef Nov 29, 2024
5221dff
Improve consistency of the test configs
ekatef Nov 29, 2024
732fcbd
Harmonize add_brownfield
ekatef Nov 30, 2024
4959a11
Update wildcards for mock_snakemake across scripts
ekatef Dec 4, 2024
513d8bc
Update a test file name in Makefile
ekatef Dec 4, 2024
a6be076
Merge branch 'main' into harmonise_wildcards
ekatef Dec 10, 2024
229235e
Fix refuse
ekatef Dec 10, 2024
67d6325
Merge branch 'main' into harmonise_wildcards
ekatef Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Loading
Loading status checks…
Update a test file name in Makefile
@ekatef
ekatef committed Dec 4, 2024
commit 513d8bcf32ce80db24e0ca7218839de465d49f6d
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ test:
snakemake solve_all_networks -call --configfile config.tutorial.yaml configs/scenarios/config.NG.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
snakemake -c4 solve_sector_networks --configfile config.tutorial.yaml test/config.test1.yaml
snakemake -c4 solve_sector_networks --configfile config.tutorial.yaml test/config.sector.yaml
echo "All tests completed successfully."

setup:
@@ -24,5 +24,5 @@ clean:
snakemake -j1 solve_all_networks --delete-all-output --configfile config.tutorial.yaml configs/scenarios/config.NG.yaml
snakemake -j1 solve_all_networks_monte --delete-all-output --configfile test/config.monte_carlo.yaml
snakemake -j1 run_all_scenarios --delete-all-output --configfile test/config.landlock.yaml
snakemake -j1 solve_sector_networks --delete-all-output --configfile test/config.test1.yaml
snakemake -j1 solve_sector_networks --delete-all-output --configfile test/config.sector.yaml
echo "Clean-up complete."