Skip to content

Commit 4ff9378

Browse files
jonathan-peelpre-commit-ci[bot]
authored andcommitted
Bugfix pypsa eur as snakemake module (#1967)
* Fix Bug 1: Resolve double prefixing caused by f-string coercion. * Fix Bug 2: Rule retrieve_co2stop not saving files in correct location. Fix by making filepaths relative to an input or output location. * Fix Bug 3: make filepaths in rule retrieve_corine relative to the zip_file in `input` * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Updated release notes --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 795f997 commit 4ff9378

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

rules/build_electricity.smk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ rule determine_availability_matrix:
268268
renewable=config_provider("renewable"),
269269
input:
270270
unpack(input_ua_md_availability_matrix),
271-
corine=ancient(f"{rules.retrieve_corine.output['tif_file']}"),
271+
corine=ancient(rules.retrieve_corine.output["tif_file"]),
272272
natura=lambda w: (
273273
f"{NATURA_DATASET["folder"]}/natura.tiff"
274274
if config_provider("renewable", w.technology, "natura")(w)

rules/retrieve.smk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ if (CORINE_DATASET := dataset_version("corine"))["source"] in ["archive"]:
8484
unpack_archive(input["zip_file"], output_folder)
8585
copy2(input["zip_file"], output["zip_file"])
8686
copy2(
87-
f"{CORINE_DATASET['folder']}/corine/g250_clc06_V18_5.tif",
88-
output["tif_file"],
87+
f"{output_folder}/corine/g250_clc06_V18_5.tif", output["tif_file"]
8988
)
9089

9190
elif (CORINE_DATASET := dataset_version("corine"))["source"] in ["primary"]:
@@ -615,8 +614,10 @@ if (CO2STOP_DATASET := dataset_version("co2stop"))["source"] in [
615614
traps_table3=f"{CO2STOP_DATASET['folder']}/CO2JRC_OpenFormats/CO2Stop_DataInterrogationSystem/Hydrocarbon_Traps1.csv",
616615
traps_map=f"{CO2STOP_DATASET['folder']}/CO2JRC_OpenFormats/CO2Stop_Polygons Data/DaughterUnits_March13.kml",
617616
run:
617+
output_folder = Path(output["zip_file"]).parent
618+
output_folder.mkdir(parents=True, exist_ok=True)
618619
copy2(input["zip_file"], output["zip_file"])
619-
unpack_archive(output["zip_file"], CO2STOP_DATASET["folder"])
620+
unpack_archive(output["zip_file"], output_folder)
620621

621622

622623
if (GEM_EUROPE_GAS_TRACKER_DATASET := dataset_version("gem_europe_gas_tracker"))[

0 commit comments

Comments
 (0)