Merge pull request #456 from OpenEnergyPlatform/bugfix-455-update-gsgk-tablename

Hotfix 455 update gsgk tablename

Author: FlorianK13

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.13.1
+current_version = 0.13.2
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>(a|na))+(?P<build>\d+))?
 serialize = 
 	{major}.{minor}.{patch}{release}{build}

.github/workflows/ci-production.yml

@@ -34,7 +34,7 @@ jobs:
     - name: create package
       run: python setup.py sdist
     - name: import open-mastr
-      run: python -m pip install ./dist/open_mastr-0.13.1.tar.gz
+      run: python -m pip install ./dist/open_mastr-0.13.2.tar.gz
     - name: Create credentials file
       env:
         MASTR_TOKEN: ${{ secrets.MASTR_TOKEN }}

.pre-commit-config.yaml

@@ -3,4 +3,4 @@ repos:
     rev: 22.6.0
     hooks:
       - id: black
-        language_version: python3.9
+        language_version: python3.10

CHANGELOG.md

@@ -6,6 +6,10 @@ For each version important additions, changes and removals are listed here.
 The format is inspired from [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v0.13.2] Hotfix - 2023-08-07
+### Changed
+- Changed the name of the bulk tables for technology=gsgk [#456](https://github.com/OpenEnergyPlatform/open-MaStR/pull/456)
+
 ## [v0.13.1] Hotfix - 2023-04-11
 
 ### Added

CITATION.cff

@@ -28,7 +28,7 @@ authors:
 title: "open-MaStR"
 type: software
 license: AGPL-3.0
-version: 0.13.1
+version: 0.13.2
 doi: 
-date-released: 2023-04-11
+date-released: 2023-08-07
 url: "https://github.com/OpenEnergyPlatform/open-MaStR/"

docs/requirements.txt

@@ -1,4 +1,4 @@
-sphinx>=2
+sphinx<7
 sphinx-rtd-theme
 sphinx-tabs
 m2r2

open_mastr/utils/constants.py

@@ -82,8 +82,8 @@
     "biomass": ["anlageneegbiomasse", "einheitenbiomasse"],
     "hydro": ["anlageneegwasser", "einheitenwasser"],
     "gsgk": [
-        "anlageneeggeosolarthermiegrubenklaerschlammdruckentspannung",
-        "einheitengeosolarthermiegrubenklaerschlammdruckentspannung",
+        "anlageneeggeothermiegrubengasdruckentspannung",
+        "einheitengeothermiegrubengasdruckentspannung",
     ],
     "combustion": ["anlagenkwk", "einheitenverbrennung"],
     "nuclear": ["einheitenkernkraft"],

open_mastr/xml_download/utils_download_bulk.py

@@ -1,11 +1,12 @@
-import requests
-from tqdm import tqdm
-import time
-from bs4 import BeautifulSoup
-import numpy as np
 import os
 import shutil
-from zipfile import ZipFile, BadZipfile
+import time
+from zipfile import BadZipfile, ZipFile
+
+import numpy as np
+import requests
+from bs4 import BeautifulSoup
+from tqdm import tqdm
 
 # setup logger
 from open_mastr.utils.config import setup_logger
@@ -71,9 +72,9 @@ def download_xml_Mastr(
     url = get_url_from_Mastr_website()
     time_a = time.perf_counter()
     r = requests.get(url, stream=True)
-    total_length = int(10000 * 1024 * 1024)
+    total_length = int(18000 * 1024 * 1024)
     with open(save_path, "wb") as zfile, tqdm(
-        desc=save_path, total=(total_length / 1024 / 1024), unit="MB"
+        desc=save_path, total=(total_length / 1024 / 1024), unit=""
     ) as bar:
         for chunk in r.iter_content(chunk_size=1024 * 1024):
             # chunk size of 1024 * 1024 needs 9min 11 sek = 551sek

setup.py

@@ -18,14 +18,14 @@
         "open_mastr.utils.config",
         "open_mastr.xml_download",
     ],
-    version="0.13.1",
+    version="0.13.2",
     description="A package that provides an interface for downloading and"
     " processing the data of the Marktstammdatenregister (MaStR)",
     long_description=long_description,
     long_description_content_type="text/x-rst",
     url="https://github.com/OpenEnergyPlatform/open-MaStR",
     download_url="https://github.com/OpenEnergyPlatform/open-MaStR/archive"
-    "/refs/tags/v0.13.1.tar.gz",
+    "/refs/tags/v0.13.2.tar.gz",
     author="Open Energy Family",
     author_email="datenzentrum@rl-institut.de",
     maintainer="Ludwig Hülk",