Skip to content

refactor: fix quoting for clarity #791

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

Merged
tgilon merged 2 commits into from
Jul 22, 2026
+11 −9
Merged

refactor: fix quoting for clarity #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dffb3c7
refactor: fix quoting for clarity
tgilon Jul 15, 2026
6023c4a
doc: add release note
tgilon Jul 15, 2026
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
2 changes: 2 additions & 0 deletions doc/release_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@

* Disentangle the `data/versions.csv` file by introducing `data/tyndp_versions.csv` ([#788](https://github.com/open-energy-transition/open-tyndp/pull/788)). All the TYNDP-specific version entries, as well as the `tyndp-archive` entries, are now tracked in this dedicated file.

* Fix quoting patterns for clarity ([#791](https://github.com/open-energy-transition/open-tyndp/pull/791)).


## Upcoming PyPSA-Eur Release

Expand Down
2 changes: 1 addition & 1 deletion rules/cba.smk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if (CBA_NON_CO2_DATASET := dataset_version("tyndp_cba_non_co2_emissions"))[
input:
file=storage(CBA_NON_CO2_DATASET["url"]),
output:
file=f"{CBA_NON_CO2_DATASET["folder"]}/a.3_non-co2-emissions.csv",
file=f"{CBA_NON_CO2_DATASET['folder']}/a.3_non-co2-emissions.csv",
log:
"logs/retrieve_tyndp_cba_non_co2_emissions.log",
run:
Expand Down
16 changes: 8 additions & 8 deletions rules/sb.smk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if (PECD_DATASET := dataset_version("tyndp_pecd"))["source"] in ARCHIVE_SOURCES:
rule retrieve_tyndp_pecd:
input:
zip_file=storage(
PECD_DATASET["url"] + f"PECD_{PECD_DATASET["version"]}.zip"
PECD_DATASET["url"] + f"PECD_{PECD_DATASET['version']}.zip"
),
output:
dir=directory(PECD_DATASET["folder"]),
Expand All @@ -34,9 +34,9 @@ if (VIS_PLFM_DATASET := dataset_version("tyndp_vis_plfm"))["source"] in ARCHIVE_
zip_file=storage(VIS_PLFM_DATASET["url"]),
output:
dir=directory(VIS_PLFM_DATASET["folder"]),
elec_demand=f"{VIS_PLFM_DATASET["folder"]}/250117_TYNDP2024Scenarios_Electricity_Demand.xlsx",
elec_flex=f"{VIS_PLFM_DATASET["folder"]}/250117_TYNDP2024Scenarios_Electricity_Flexibility.xlsx",
elec_supply=f"{VIS_PLFM_DATASET["folder"]}/250117_TYNDP2024Scenarios_Electricity_SupplyMix.xlsx",
elec_demand=f"{VIS_PLFM_DATASET['folder']}/250117_TYNDP2024Scenarios_Electricity_Demand.xlsx",
elec_flex=f"{VIS_PLFM_DATASET['folder']}/250117_TYNDP2024Scenarios_Electricity_Flexibility.xlsx",
elec_supply=f"{VIS_PLFM_DATASET['folder']}/250117_TYNDP2024Scenarios_Electricity_SupplyMix.xlsx",
log:
"logs/retrieve_tyndp_vp_data.log",
run:
Expand All @@ -55,8 +55,8 @@ if (NUC_PROFILES := dataset_version("tyndp_nuclear_profiles"))[
zip_file=storage(NUC_PROFILES["url"]),
output:
dir=directory(NUC_PROFILES["folder"]),
nuclear_p_max_pu_2030=f"{NUC_PROFILES["folder"]}/nuclear_p_max_pu_2030.csv",
nuclear_p_max_pu_2040=f"{NUC_PROFILES["folder"]}/nuclear_p_max_pu_2040.csv",
nuclear_p_max_pu_2030=f"{NUC_PROFILES['folder']}/nuclear_p_max_pu_2030.csv",
nuclear_p_max_pu_2040=f"{NUC_PROFILES['folder']}/nuclear_p_max_pu_2040.csv",
log:
"logs/retrieve_tyndp_nuclear_profiles.log",
run:
Expand Down Expand Up @@ -120,7 +120,7 @@ rule retrieve_countries_centroids:
if not "pre-built" in PECD_DATASET["version"]:

def get_pecd_prebuilt_version(increment_minor=True):
prebuilt_prefix = f"{PECD_DATASET["version"]}+pre-built."
prebuilt_prefix = f"{PECD_DATASET['version']}+pre-built."
versions = (
dataset_version("tyndp_pecd", all_versions=True)
.query("version.str.contains(@prebuilt_prefix, regex=False)")
Expand All @@ -142,7 +142,7 @@ if not "pre-built" in PECD_DATASET["version"]:
pecd_raw=PECD_DATASET["folder"],
output:
pecd_prebuilt=directory(
f"{PECD_DATASET["folder"]}+pre-built.{get_pecd_prebuilt_version(increment_minor= True)}"
f"{PECD_DATASET['folder']}+pre-built.{get_pecd_prebuilt_version(increment_minor= True)}"
),
log:
"logs/prepare_pecd_release.log",
Expand Down