Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update data bundle version (with reduced files) #1291

Merged
merged 3 commits into from
Sep 13, 2024
Merged

update data bundle version (with reduced files) #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f80a906
update data bundle version (with reduced files)
fneum Sep 13, 2024
65c65ab
update data bundle to v0.4.1 with corrected permissions
fneum Sep 13, 2024
05728c7
Merge branch 'master' into data-bundle
fneum Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions rules/retrieve.smk
View file
Open in desktop
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
View file
Open in desktop
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
Loading