Skip to content

Commit 33664a6

Browse files
remove retrieve.yaml (#1509)
* remove retrieve.yaml (closes #1489) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent aa2fb23 commit 33664a6

File tree

3 files changed

+10
-28
lines changed

3 files changed

+10
-28
lines changed

Snakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ rule create_scenarios:
8181
output:
8282
config["run"]["scenarios"]["file"],
8383
conda:
84-
"envs/retrieve.yaml"
84+
"envs/environment.yaml"
8585
script:
8686
"config/create_scenarios.py"
8787

envs/retrieve.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

rules/retrieve.smk

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle",
4040
mem_mb=1000,
4141
retries: 2
4242
conda:
43-
"../envs/retrieve.yaml"
43+
"../envs/environment.yaml"
4444
script:
4545
"../scripts/retrieve_databundle.py"
4646

@@ -51,7 +51,7 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle",
5151
"logs/retrieve_eurostat_data.log",
5252
retries: 2
5353
conda:
54-
"../envs/retrieve.yaml"
54+
"../envs/environment.yaml"
5555
script:
5656
"../scripts/retrieve_eurostat_data.py"
5757

@@ -71,7 +71,7 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle",
7171
"logs/retrieve_eurostat_household_data.log",
7272
retries: 2
7373
conda:
74-
"../envs/retrieve.yaml"
74+
"../envs/environment.yaml"
7575
script:
7676
"../scripts/retrieve_eurostat_household_data.py"
7777

@@ -162,7 +162,7 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_cost_data", T
162162
mem_mb=1000,
163163
retries: 2
164164
conda:
165-
"../envs/retrieve.yaml"
165+
"../envs/environment.yaml"
166166
script:
167167
"../scripts/retrieve_cost_data.py"
168168

@@ -183,7 +183,7 @@ if config["enable"]["retrieve"]:
183183
"logs/retrieve_gas_infrastructure_data.log",
184184
retries: 2
185185
conda:
186-
"../envs/retrieve.yaml"
186+
"../envs/environment.yaml"
187187
script:
188188
"../scripts/retrieve_gas_infrastructure_data.py"
189189

@@ -201,7 +201,7 @@ if config["enable"]["retrieve"]:
201201
mem_mb=5000,
202202
retries: 2
203203
conda:
204-
"../envs/retrieve.yaml"
204+
"../envs/environment.yaml"
205205
script:
206206
"../scripts/retrieve_electricity_demand.py"
207207

@@ -539,7 +539,7 @@ if config["enable"]["retrieve"]:
539539
mem_mb=5000,
540540
retries: 2
541541
conda:
542-
"../envs/retrieve.yaml"
542+
"../envs/environment.yaml"
543543
script:
544544
"../scripts/retrieve_monthly_fuel_prices.py"
545545

@@ -604,7 +604,7 @@ if config["enable"]["retrieve"] and (
604604
"logs/retrieve_osm_data_{country}.log",
605605
threads: 1
606606
conda:
607-
"../envs/retrieve.yaml"
607+
"../envs/environment.yaml"
608608
script:
609609
"../scripts/retrieve_osm_data.py"
610610

@@ -646,7 +646,7 @@ if config["enable"]["retrieve"]:
646646
"logs/retrieve_osm_boundaries_{country}_adm1.log",
647647
threads: 1
648648
conda:
649-
"../envs/retrieve.yaml"
649+
"../envs/environment.yaml"
650650
script:
651651
"../scripts/retrieve_osm_boundaries.py"
652652

0 commit comments

Comments
 (0)