Skip to content

Commit

Permalink
update data bundle version (with reduced files) (#1291)
Browse files Browse the repository at this point in the history
* update data bundle version (with reduced files)

* update data bundle to v0.4.1 with corrected permissions
  • Loading branch information
fneum authored Sep 13, 2024
1 parent 3e22866 commit dbe7f48
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions rules/retrieve.smk
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle",
rule retrieve_databundle:
output:
expand("data/bundle/{file}", file=datafiles),
directory("data/bundle/jrc-idees-2015"),
log:
"logs/retrieve_databundle.log",
resources:
Expand Down Expand Up @@ -201,7 +200,7 @@ if config["enable"]["retrieve"]:
rule retrieve_ship_raster:
input:
storage(
"https://zenodo.org/records/12760663/files/shipdensity_global.zip",
"https://zenodo.org/records/13757228/files/shipdensity_global.zip",
keep_local=True,
),
output:
Expand Down
8 changes: 4 additions & 4 deletions scripts/retrieve_databundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
#
# SPDX-License-Identifier: MIT
"""
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3517935.svg
:target: https://doi.org/10.5281/zenodo.3517935
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3517934.svg
:target: https://doi.org/10.5281/zenodo.3517934
The data bundle contains common GIS datasets like NUTS3 shapes, EEZ shapes,
CORINE Landcover, Natura 2000 and also electricity specific summary statistics
like historic per country yearly totals of hydro generation, GDP and population
data on NUTS3 levels and energy balances.
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
``data/bundle`` subdirectory.
Expand Down Expand Up @@ -48,7 +48,7 @@
configure_logging(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")
to_fn = Path(rootpath) / Path(snakemake.output[0]).parent.parent
Expand Down

0 comments on commit dbe7f48

Please sign in to comment.