bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

update data bundle version (with reduced files) (#1291)

Browse Source 
* update data bundle version (with reduced files)

* update data bundle to v0.4.1 with corrected permissions
This commit is contained in:
Fabian Neumann 2024-09-13 11:09:27 +02:00 committed by GitHub
parent 3e2286633a
commit dbe7f48d6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rules/retrieve.smk
View File

@ -33,7 +33,6 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle",
rule retrieve_databundle: rule retrieve_databundle:
output: output:
expand("data/bundle/{file}", file=datafiles), expand("data/bundle/{file}", file=datafiles),
directory("data/bundle/jrc-idees-2015"),
log: log:
"logs/retrieve_databundle.log", "logs/retrieve_databundle.log",
resources: resources:
@ -201,7 +200,7 @@ if config["enable"]["retrieve"]:
rule retrieve_ship_raster: rule retrieve_ship_raster:
input: input:
storage( storage(
"https://zenodo.org/records/12760663/files/shipdensity_global.zip", "https://zenodo.org/records/13757228/files/shipdensity_global.zip",
keep_local=True, keep_local=True,
), ),
output: output:

8
scripts/retrieve_databundle.py
View File

@ -4,8 +4,8 @@
# #
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
""" """
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3517935.svg .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3517934.svg
:target: https://doi.org/10.5281/zenodo.3517935 :target: https://doi.org/10.5281/zenodo.3517934
The data bundle contains common GIS datasets like NUTS3 shapes, EEZ shapes, The data bundle contains common GIS datasets like NUTS3 shapes, EEZ shapes,
CORINE Landcover, Natura 2000 and also electricity specific summary statistics CORINE Landcover, Natura 2000 and also electricity specific summary statistics
@ -13,7 +13,7 @@ like historic per country yearly totals of hydro generation, GDP and population
data on NUTS3 levels and energy balances. data on NUTS3 levels and energy balances.
This rule downloads the data bundle from `zenodo This rule downloads the data bundle from `zenodo
<https://doi.org/10.5281/zenodo.3517935>`_ and extracts it in the ``data`` <https://doi.org/10.5281/zenodo.3517934>`_ and extracts it in the ``data``
sub-directory, such that all files of the bundle are stored in the sub-directory, such that all files of the bundle are stored in the
``data/bundle`` subdirectory. ``data/bundle`` subdirectory.
@ -48,7 +48,7 @@ if __name__ == "__main__":
configure_logging(snakemake) configure_logging(snakemake)
set_scenario_config(snakemake) set_scenario_config(snakemake)
url = "https://zenodo.org/records/12760663/files/bundle.tar.xz" url = "https://zenodo.org/records/13757228/files/bundle.tar.xz"
tarball_fn = Path(f"{rootpath}/bundle.tar.xz") tarball_fn = Path(f"{rootpath}/bundle.tar.xz")
to_fn = Path(rootpath) / Path(snakemake.output[0]).parent.parent to_fn = Path(rootpath) / Path(snakemake.output[0]).parent.parent