Merge pull request #1170 from openego/features/status2023-metadata

Features/status2023 metadata

.github/workflows/build.yml

@@ -25,12 +25,9 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.7"
           - "3.8"
         platform: [ubuntu-latest, macos-latest]
         exclude:
-          - platform: macos-latest
-            python-version: "3.7"
           - platform: macos-latest
             python-version: "3.8"
       max-parallel: 4

AUTHORS.rst

@@ -2,4 +2,4 @@
 Authors
 =======
 
-* Guido Pleßmann, Ilka Cußmann, Stephan Günther, Jonathan Amme, Julian Endres, Kilian Helfenbein - https://github.com/openego/eGon-data
+* Jonathan Amme, Clara Büttner, Ilka Cußman, Julian Endres, Carlos Epia, Kilian Helfenbein, Stephan Günther, Ulf Müller, Amélia Nadal, Guido Pleßmann, Francesco Witte  - https://github.com/openego/eGon-data

CHANGELOG.rst

@@ -252,6 +252,16 @@ Added
   `PR #903 <https://github.com/openego/eGon-data/pull/903>`_
 * Add low flex scenario 'eGon2035_lowflex'
   `#822 <https://github.com/openego/eGon-data/issues/822>`_
+* Add Status2023 update heat demand
+  `#199 <https://github.com/openego/powerd-data/pull/199>`_
+* Add status2023 electrical neighbours
+  `#182 <https://github.com/openego/powerd-data/pull/182>`_
+* Add Status2023 to gas nodes
+  `#205 <https://github.com/openego/powerd-data/pull/205>`_
+* Update osm for status2023
+  `#169 <https://github.com/openego/powerd-data/pull/169>`_
+* Add wrapped_partial to dynamise task generation
+  `#207 <https://github.com/openego/powerd-data/pull/207>`_
 * Add MaStR geocoding and handling of conventional generators
   `#1095 <https://github.com/openego/eGon-data/issues/1095>`_
 
@@ -494,12 +504,14 @@ Changed
   `#1073 <https://github.com/openego/eGon-data/issues/1073>`_
 * Change hgv data source to use database
   `#1086 <https://github.com/openego/eGon-data/issues/1086>`_
+* Rename eMob MIT carrier names (use underscores)
+  `#1105 <https://github.com/openego/eGon-data/issues/1105>`_
 * Change desposit ID for data_bundle download from zenodo sandbox
   `#1110 <https://github.com/openego/eGon-data/issues/1110>`_
 * Use MaStR geocoding results for pv rooftop to buildings mapping workflow
   `#1095 <https://github.com/openego/eGon-data/issues/1095>`_
-* Rename eMob MIT carrier names (use underscores)
-  `#1105 <https://github.com/openego/eGon-data/issues/1105>`_
+* Add eMob MIT for SQ2023 scenario
+  `#176 <https://github.com/openego/powerd-data/issues/176>`_
 
 .. _#799: https://github.com/openego/eGon-data/issues/799
 

README.rst

@@ -137,6 +137,18 @@ packages are required too. Right now these are:
   You also have to agree on the `terms of use
   <https://cds.climate.copernicus.eu/cdsapp/#!/terms/licence-to-use-copernicus-products>`_
 
+* To download generation and demand data from entsoe you need to register in
+  the `entsoe platform <https://transparency.entsoe.eu/>`_. Once the user is
+  created, send an email to [email protected] with “Restful API access” in
+  the subject line. Indicate the email address you entered during registration
+  in the email body. After authorisation a personal token can be generated in
+  'My Account Settings'to access the available data. This token must be saved
+  in a text file called *.entsoe-token* in the home directory.
+  In Ubuntu you can go to the home directory by typing :code:`cd ~` in a
+  terminal. To create the file execute :code:`nano ".entsoe-token"` and then
+  paste your personal token (36 characters). Finally press :code:`CRL + x` to
+  save and exit.
+
 * Make sure you have enough free disk space (~350 GB) in your working
   directory.
 

setup.py

@@ -59,7 +59,6 @@ def read(*names, **kwargs):
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: CPython",
         # uncomment if you test on these interpreters:
@@ -79,39 +78,45 @@ def read(*names, **kwargs):
     keywords=[
         # eg: 'keyword1', 'keyword2', 'keyword3',
     ],
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     install_requires=[
         # eg: 'aspectlib==1.1.1', 'six>=1.7',
-        "apache-airflow>=1.10.14,<2.0",  # See accompanying commit message
-        "atlite==0.2.5",
+        "apache-airflow>2.0",
+        "apache-airflow[postgres]",
+        "apache-airflow-providers-sendgrid",
+        "atlite==0.2.11",
         "cdsapi",
-        "click",
-        "geopandas>=0.10.0,<0.11.0",
+        "click<8.1",
+        "entsoe-py >=0.6.2",
+        "Flask-Session<0.6.0",
+        "GeoAlchemy2",
+        "geopandas>=0.10.0",
         "geopy",
-        "geovoronoi==0.3.0",
-        "importlib-resources",
+        "geovoronoi",
+        "importlib-resources<6.0",
         "loguru",
-        "markupsafe<2.1.0",  # MarkupSafe>=2.1.0 breaks WTForms<3
+        "markupsafe", 
         "matplotlib",
         "netcdf4",
-        "numpy<1.23",  # incompatibilities with shapely 1.7.
-        # See: https://stackoverflow.com/a/73354885/12460232
-        "oedialect==0.0.8",
+        "numpy",
         "omi",
         "openpyxl",
-        "pandas>1.2.0,<1.4",  # pandas>=1.4 needs SQLAlchemy>=1.4
+        "pandas>2.0.0",
         "psycopg2",
         "pyaml",
-        "pypsa==0.17.1",
+        "pypsa==0.20.1",
+        "pydantic<2.0",
         "rasterio",
+        "requests",
         "rioxarray",
         "rtree",
         "saio",
         "seaborn",
+        "setuptools>60.0",
         "shapely",
         "snakemake<7",
-        "sqlalchemy<1.4",  # Airflow<2.0 is not compatible with SQLAlchemy>=1.4
-        "wtforms<3",  # WTForms>=3.0 breaks Airflow<2.0
+        "sqlalchemy",
+        "wtforms",
         "xarray",
         "xlrd",
     ],

src/egon/data/__init__.py

@@ -2,14 +2,14 @@
 
 from loguru import logger
 import click
-
+import shutil
 __version__ = "0.0.0"
 
 
 def echo(message):
     prefix, message = message.split(" - ")
     lines = message.split("\n")
-    width = min(72, click.get_terminal_size()[0])
+    width = min(72, shutil.get_terminal_size()[0])
     wraps = ["\n".join(wrap(line, width)) for line in lines]
     message = "\n".join([prefix] + wraps)
     click.echo(message, err=True)