Merge pull request #1158 from openego/fixes/#1153-update-zenodo-link-…

…mastr Fixes/#1153 update zenodo link mastr
openego · Jan 11, 2024 · f6ed482 · f6ed482
2 parents 07db06e + f562094
commit f6ed482
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -747,8 +747,10 @@ Bug Fixes
 * Fix conversion factor for CH4 loads abroad in eGon2035
   `#1104 <https://github.com/openego/eGon-data/issues/1104>`_
 * Change structure of documentation in rtd
-  `#11126 <https://github.com/openego/eGon-data/issues/1126>`_
+  `#1126 <https://github.com/openego/eGon-data/issues/1126>`_
 * Fix URL of eGon data-bundle dataset
+  `#1154 <https://github.com/openego/eGon-data/issues/1154>`_
+* Fix URLs of MaStR datasets
 
 .. _PR #692: https://github.com/openego/eGon-data/pull/692
 .. _#343: https://github.com/openego/eGon-data/issues/343

diff --git a/docs/data/input_data.rst b/docs/data/input_data.rst
@@ -40,8 +40,8 @@ The data are obtained from zenodo, where raw MaStR data, downloaded with the too
 is provided. It contains all data from the MaStR, including possible duplicates.
 Currently, two versions are used:
 
-* `2021-05-03 <https://sandbox.zenodo.org/record/1167119>`_
-* `2022-11-17 <https://sandbox.zenodo.org/record/1132839>`_
+* `2021-04-30 <https://zenodo.org/records/10480930>`_
+* `2022-11-17 <https://zenodo.org/records/10480958>`_
 
 The download is implemented in :class:`MastrData<egon.data.datasets.mastr.MastrData>`.
 

diff --git a/src/egon/data/datasets.yml b/src/egon/data/datasets.yml
@@ -295,7 +295,7 @@ mastr:
     - "gsgk"
     - "storage"
   file_basename: "bnetza_mastr"
-  deposit_id: 808086
+  deposit_id: 10480930
 
 mastr_new:
   technologies:
@@ -308,7 +308,7 @@ mastr_new:
     - "storage"
     - "wind"
   file_basename: "bnetza_mastr"
-  deposit_id: 1132987
+  deposit_id: 10480958
   egon2021_date_max: "2021-12-31 23:59:00"
   geocoding_path:
     - "data_bundle_egon_data"

diff --git a/src/egon/data/datasets/mastr.py b/src/egon/data/datasets/mastr.py
@@ -22,7 +22,7 @@ def download(dataset_name, download_dir):
         # Get parameters from config and set download URL
         data_config = egon.data.config.datasets()[dataset_name]
         zenodo_files_url = (
-            f"https://sandbox.zenodo.org/record/"
+            f"https://zenodo.org/record/"
             f"{data_config['deposit_id']}/files/"
         )
 
@@ -58,15 +58,15 @@ class mastr_data_setup(Dataset):
 
     The downloaded data incorporates two different datasets:
 
-    Dump 2021-05-03
-      * Source: https://sandbox.zenodo.org/record/808086
+    Dump 2021-04-30
+      * Source: https://zenodo.org/records/10480930
       * Used technologies: PV plants, wind turbines, biomass, hydro plants,
         combustion, nuclear, gsgk, storage
       * Data is further processed in the :py:class:`PowerPlants
         <egon.data.datasets.power_plants.PowerPlants>` dataset
 
     Dump 2022-11-17
-      * Source: https://sandbox.zenodo.org/record/1132839
+      * Source: https://zenodo.org/records/10480958
       * Used technologies: PV plants, wind turbines, biomass, hydro plants
       * Data is further processed in module :py:mod:`mastr
         <egon.data.datasets.power_plants.mastr>` and :py:class:`PowerPlants
@@ -79,7 +79,7 @@ class mastr_data_setup(Dataset):
     #:
     name: str = "MastrData"
     #:
-    version: str = "0.0.1"
+    version: str = "0.0.2"
     #:
     tasks = (download_mastr_data,)