Merge pull request #366 from openego/egon_dev

Integrate egon_data data

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
   -   id: end-of-file-fixer
   -   id: trailing-whitespace
 - repo: https://github.com/psf/black
-  rev: 22.8.0
+  rev: 22.10.0
   hooks:
     - id: black
 - repo: https://github.com/pycqa/flake8
@@ -19,14 +19,14 @@ repos:
     - id: isort
       name: isort (python)
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.38.0
+  rev: v3.2.0
   hooks:
     - id: pyupgrade
 #- repo: https://github.com/pycqa/pylint
 #  rev: pylint-2.6.0
 #  hooks:
 #    - id: pylint
 - repo: https://github.com/kynan/nbstripout
-  rev: 0.6.0
+  rev: 0.6.1
   hooks:
     - id: nbstripout

doc/conf.py

@@ -115,7 +115,7 @@ def setup(sphinx):
         "networkx.%s",
     ),
     "sqlalchemy": (
-        "http://docs.sqlalchemy.org/en/latest/orm/session_basics.html%s",
+        "http://docs.sqlalchemy.org/en/latest/core/connections.html#%s",
         "sqlalchemy.%s",
     ),
     "shapely": (

doc/dev_notes.rst

@@ -82,3 +82,9 @@ To manually check if external links in the documentation work, you can run the f
 
    sphinx-build ./doc/ -b linkcheck -d _build/doctrees _build/html
 
+Internal links can be checked adding -n option when building the documentation. This will
+also raise warnings for type hinting, so it is a bit confusing, but can still be helpful.
+
+.. code-block:: bash
+
+    sphinx-build -n -E -a -b html ./doc/ <outputdir>

doc/quickstart.rst

@@ -243,7 +243,7 @@ time series:
     # load time series (scaled by annual demand)
     timeseries_load = pd.DataFrame(
         {"residential": [0.0001] * len(timeindex),
-         "retail": [0.0002] * len(timeindex),
+         "cts": [0.0002] * len(timeindex),
          "industrial": [0.00015] * len(timeindex),
          "agricultural": [0.00005] * len(timeindex)
          },

doc/whatsnew/v0-3-0.rst

@@ -0,0 +1,16 @@
+Release v0.3.0
+================
+
+Release date: <month> <day>, <year>
+
+Changes
+-------
+
+* Added functionalities to obtain electromobility, DSM, storage and electricity timeseries data from oedb `#328 <https://github.com/openego/eDisGo/pull/328>`_
+* Added functionalities to obtain heat pump data from oedb `#324 <https://github.com/openego/eDisGo/pull/324>`_
+* Added functionality to resample and check integrity of flexibility bands `#341 <https://github.com/openego/eDisGo/pull/341>`_
+* Added function to sort buses in lines dataframe such that bus0 is always the upstream bus `#335 <https://github.com/openego/eDisGo/pull/335>`_
+* Changed to_pypsa function such that pypsa network can be build even though not all components have time series `#335 <https://github.com/openego/eDisGo/pull/335>`_
+* Added class holding data from overlying grid, such as curtailment requirements and
+  conventional generator dispatch `#335 <https://github.com/openego/eDisGo/pull/335>`_
+* Added integrity check for very short lines `#335 <https://github.com/openego/eDisGo/pull/335>`_

edisgo/config/config_grid_default.cfg

@@ -36,6 +36,19 @@ conn_buffer_radius_inc = 1000
 #     unit: -
 conn_diff_tolerance = 0.0001
 
+# Upper limits for nominal capacity in MW at which generators, loads and storage units are
+# integrated into a certain voltage level. The voltage levels have the following meaning:
+# voltage level 7 = LV grid
+# voltage level 6 = LV side of MV-LV station
+# voltage level 5 =  MV grid
+# voltage level 4 = MV side of HV-MS station
+# The upper limit of one voltage level at the same time signifies the lower limit of
+# the next higher voltage level, i.e. upper limit of voltage limit 7 is lower limit for
+# voltage level 6.
+upper_limit_voltage_level_7 = 0.1
+upper_limit_voltage_level_6 = 0.3
+upper_limit_voltage_level_5 = 4.5
+upper_limit_voltage_level_4 = 17.5
 
 [disconnecting_point]