diff --git a/rules/retrieve.smk b/rules/retrieve.smk index c842e61f..e13aa32f 100755 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -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: @@ -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: diff --git a/scripts/retrieve_databundle.py b/scripts/retrieve_databundle.py index 63b71dd5..95856f38 100644 --- a/scripts/retrieve_databundle.py +++ b/scripts/retrieve_databundle.py @@ -4,8 +4,8 @@ # # 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 @@ -13,7 +13,7 @@ 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 -`_ and extracts it in the ``data`` +`_ and extracts it in the ``data`` sub-directory, such that all files of the bundle are stored in the ``data/bundle`` subdirectory. @@ -48,7 +48,7 @@ if __name__ == "__main__": 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