Skip to content

Commit

Permalink
Merge pull request calliope-project#323 from timtroendle/fix-curl-err…
Browse files Browse the repository at this point in the history
…or-messages

Fix error messages of curl
  • Loading branch information
brynpickering authored Apr 9, 2024
2 parents de35786 + 7238ecb commit 4c4c713
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions rules/shapes.smk
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ rule download_raw_gadm_administrative_borders:
params: url = lambda wildcards: config["data-sources"]["gadm"].format(country_code=wildcards.country_code)
output: protected("data/automatic/raw-gadm/{country_code}.zip")
conda: "../envs/shell.yaml"
shell: "curl -sLo {output} '{params.url}'"
shell: "curl -sSLo {output} '{params.url}'"


rule raw_gadm_administrative_borders:
Expand Down Expand Up @@ -57,7 +57,7 @@ rule download_raw_nuts_units:
params: url = config["data-sources"]["nuts"]
output: protected("data/automatic/raw-nuts-units.zip")
conda: "../envs/shell.yaml"
shell: "curl -sLo {output} '{params.url}'"
shell: "curl -sSLo {output} '{params.url}'"


rule administrative_borders_nuts:
Expand Down Expand Up @@ -106,7 +106,7 @@ rule download_eez:
output: protected("data/automatic/eez.zip")
params: url = config["data-sources"]["eez"]
conda: "../envs/shell.yaml"
shell: "curl -sLo {output} '{params.url}'"
shell: "curl -sSLo {output} '{params.url}'"


rule eez:
Expand Down
4 changes: 2 additions & 2 deletions rules/wind-and-solar.smk
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rule download_potentials:
params: url = config["data-sources"]["potentials"]
output: protected("data/automatic/raw-potentials.zip")
conda: "../envs/shell.yaml"
shell: "curl -sLo {output} '{params.url}'"
shell: "curl -sSLo {output} '{params.url}'"


rule potentials:
Expand All @@ -37,7 +37,7 @@ rule download_capacity_factors_wind_and_solar:
params: url = lambda wildcards: config["data-sources"]["capacity-factors"].format(filename=wildcards.filename)
output: protected("data/automatic/capacityfactors/{filename}")
conda: "../envs/shell.yaml"
shell: "curl -sLo {output} '{params.url}'"
shell: "curl -sSLo {output} '{params.url}'"


rule area_to_capacity_limits:
Expand Down

0 comments on commit 4c4c713

Please sign in to comment.