Skip to content

Commit 85bb54f

Browse files
authored
refactor: fix quoting for clarity (#791)
* refactor: fix quoting for clarity * doc: add release note
1 parent d426d73 commit 85bb54f

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

doc/release_notes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272

7373
* 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.
7474

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

7678
## Upcoming PyPSA-Eur Release
7779

rules/cba.smk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if (CBA_NON_CO2_DATASET := dataset_version("tyndp_cba_non_co2_emissions"))[
5353
input:
5454
file=storage(CBA_NON_CO2_DATASET["url"]),
5555
output:
56-
file=f"{CBA_NON_CO2_DATASET["folder"]}/a.3_non-co2-emissions.csv",
56+
file=f"{CBA_NON_CO2_DATASET['folder']}/a.3_non-co2-emissions.csv",
5757
log:
5858
"logs/retrieve_tyndp_cba_non_co2_emissions.log",
5959
run:

rules/sb.smk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if (PECD_DATASET := dataset_version("tyndp_pecd"))["source"] in ARCHIVE_SOURCES:
1515
rule retrieve_tyndp_pecd:
1616
input:
1717
zip_file=storage(
18-
PECD_DATASET["url"] + f"PECD_{PECD_DATASET["version"]}.zip"
18+
PECD_DATASET["url"] + f"PECD_{PECD_DATASET['version']}.zip"
1919
),
2020
output:
2121
dir=directory(PECD_DATASET["folder"]),
@@ -34,9 +34,9 @@ if (VIS_PLFM_DATASET := dataset_version("tyndp_vis_plfm"))["source"] in ARCHIVE_
3434
zip_file=storage(VIS_PLFM_DATASET["url"]),
3535
output:
3636
dir=directory(VIS_PLFM_DATASET["folder"]),
37-
elec_demand=f"{VIS_PLFM_DATASET["folder"]}/250117_TYNDP2024Scenarios_Electricity_Demand.xlsx",
38-
elec_flex=f"{VIS_PLFM_DATASET["folder"]}/250117_TYNDP2024Scenarios_Electricity_Flexibility.xlsx",
39-
elec_supply=f"{VIS_PLFM_DATASET["folder"]}/250117_TYNDP2024Scenarios_Electricity_SupplyMix.xlsx",
37+
elec_demand=f"{VIS_PLFM_DATASET['folder']}/250117_TYNDP2024Scenarios_Electricity_Demand.xlsx",
38+
elec_flex=f"{VIS_PLFM_DATASET['folder']}/250117_TYNDP2024Scenarios_Electricity_Flexibility.xlsx",
39+
elec_supply=f"{VIS_PLFM_DATASET['folder']}/250117_TYNDP2024Scenarios_Electricity_SupplyMix.xlsx",
4040
log:
4141
"logs/retrieve_tyndp_vp_data.log",
4242
run:
@@ -55,8 +55,8 @@ if (NUC_PROFILES := dataset_version("tyndp_nuclear_profiles"))[
5555
zip_file=storage(NUC_PROFILES["url"]),
5656
output:
5757
dir=directory(NUC_PROFILES["folder"]),
58-
nuclear_p_max_pu_2030=f"{NUC_PROFILES["folder"]}/nuclear_p_max_pu_2030.csv",
59-
nuclear_p_max_pu_2040=f"{NUC_PROFILES["folder"]}/nuclear_p_max_pu_2040.csv",
58+
nuclear_p_max_pu_2030=f"{NUC_PROFILES['folder']}/nuclear_p_max_pu_2030.csv",
59+
nuclear_p_max_pu_2040=f"{NUC_PROFILES['folder']}/nuclear_p_max_pu_2040.csv",
6060
log:
6161
"logs/retrieve_tyndp_nuclear_profiles.log",
6262
run:
@@ -120,7 +120,7 @@ rule retrieve_countries_centroids:
120120
if not "pre-built" in PECD_DATASET["version"]:
121121

122122
def get_pecd_prebuilt_version(increment_minor=True):
123-
prebuilt_prefix = f"{PECD_DATASET["version"]}+pre-built."
123+
prebuilt_prefix = f"{PECD_DATASET['version']}+pre-built."
124124
versions = (
125125
dataset_version("tyndp_pecd", all_versions=True)
126126
.query("version.str.contains(@prebuilt_prefix, regex=False)")
@@ -142,7 +142,7 @@ if not "pre-built" in PECD_DATASET["version"]:
142142
pecd_raw=PECD_DATASET["folder"],
143143
output:
144144
pecd_prebuilt=directory(
145-
f"{PECD_DATASET["folder"]}+pre-built.{get_pecd_prebuilt_version(increment_minor= True)}"
145+
f"{PECD_DATASET['folder']}+pre-built.{get_pecd_prebuilt_version(increment_minor= True)}"
146146
),
147147
log:
148148
"logs/prepare_pecd_release.log",

0 commit comments

Comments
 (0)