update Release 0.3.4

.flake8

@@ -0,0 +1,7 @@
+[flake8]
+extend-exclude = docs
+max-line-length = 88
+extend-ignore = E203, F841
+count = true
+statistics = true
+show-source = true

.isort.cfg

@@ -0,0 +1,4 @@
+[settings]
+profile = black
+multi_line_output = 3
+lines_between_types = 1

.pre-commit-config.yaml

@@ -0,0 +1,24 @@
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.3.0
+  hooks:
+  -   id: check-yaml
+  -   id: end-of-file-fixer
+  -   id: trailing-whitespace
+- repo: https://github.com/psf/black
+  rev: 22.8.0
+  hooks:
+    - id: black
+- repo: https://github.com/pycqa/isort
+  rev: 5.10.1
+  hooks:
+    - id: isort
+      name: isort (python)
+- repo: https://github.com/asottile/pyupgrade
+  rev: v2.38.0
+  hooks:
+    - id: pyupgrade
+- repo: https://github.com/pycqa/flake8
+  rev: 5.0.4
+  hooks:
+    - id: flake8

README.rst

@@ -4,7 +4,7 @@
 
 
 .. image:: https://openegoproject.files.wordpress.com/2017/02/open_ego_logo_breit.png?w=400
- 
+
 
 *A cross-grid-level electricity grid and storage optimization tool*
 | `openegoproject.wordpress.com <https://openegoproject.wordpress.com/>`_
@@ -16,8 +16,8 @@ eGo
 
 Integrated optimization of flexibility options and grid extension measures
 for power grids based on `eTraGo <http://eTraGo.readthedocs.io/>`_ and
-`eDisGo <http://edisgo.readthedocs.io/>`_. The Documentation of the eGo tool 
-can be found on 
+`eDisGo <http://edisgo.readthedocs.io/>`_. The Documentation of the eGo tool
+can be found on
 `openego.readthedocs.io <https://openego.readthedocs.io/>`_ .
 
 .. contents::
@@ -35,7 +35,7 @@ In case of installation errors of pypsa-fork use:
 
 ..  code-block::
 
-   $ pip3 install -e git+https://github.com/openego/PyPSA@master#egg=0.11.0fork 
+   $ pip3 install -e git+https://github.com/openego/PyPSA@master#egg=0.11.0fork
 
 
 ----------------------------
@@ -46,10 +46,12 @@ Create a virtualenvironment and activate it:
 
 .. code-block::
 
-   $ virtualenv venv --clear -p python3.5
+   $ virtualenv venv --clear -p python3.8
    $ source venv/bin/activate
-   $ cd venv
-   $ pip3 install -e git+https://github.com/openego/eGo@dev#egg=eGo --process-dependency-links
+   $ cd path/to/eGo
+   $ python -m pip install -e .[full]
+   $ pre-commit install  # install pre-commit hooks
+
 
 -------
 License
@@ -84,6 +86,6 @@ this program. If not, see https://www.gnu.org/licenses/.
 .. |readthedocs| image:: https://readthedocs.org/projects/openego/badge/?version=master
     :target: http://openego.readthedocs.io/en/latest/?badge=master
     :alt: Documentation Status
-    
+
 .. |zenodo| image:: https://zenodo.org/badge/87306120.svg
     :target: https://zenodo.org/badge/latestdoi/87306120

doc/api/modules.rst

@@ -12,12 +12,12 @@ Overview of modules
    :maxdepth: 7
 
    ego.tools
-   
+
 scenario_settings.json
 ======================
 
-With the ``scenario_settings.json`` file you set up your calcualtion. 
-The file can be found on 
+With the ``scenario_settings.json`` file you set up your calcualtion.
+The file can be found on
 `github <https://github.com/openego/eGo/blob/master/ego/scenario_setting.json>`_.
 
 .. json:object:: scenario_setting.json
@@ -33,42 +33,37 @@ The file can be found on
 
 
 .. json:object:: global
-   
+
    :property bool eTraGo: Decide if you want to run the eTraGo tool (HV/EHV grid optimization).
    :property bool eDisGo: Decide if you want to run the eDisGo tool (MV grid optimiztaion). Please note: eDisGo requires eTraGo= ``true``.
-   :property string csv_import_eTraGo: ``false`` or path to previously calculated eTraGo results (in order to reload the results instead of performing a new run). 
-   :property string csv_import_eDisGo: ``false`` or path to previously calculated eDisGo results (in order to reload the results instead of performing a new run). 
+   :property string csv_import_eTraGo: ``false`` or path to previously calculated eTraGo results (in order to reload the results instead of performing a new run).
+   :property string csv_import_eDisGo: ``false`` or path to previously calculated eDisGo results (in order to reload the results instead of performing a new run).
+
 
-
 .. json:object:: eTraGo
 
    This section of :json:object:`scenario_setting.json` contains all input parameters for the eTraGo tool. A description of the parameters can be found `here. <https://etrago.readthedocs.io/en/dev/api/etrago.html#module-etrago.appl>`_
-	
+
 
 .. json:object:: eDisGo
 
    This section of :json:object:`scenario_setting.json` contains all input parameters for the eDisGo tool and the clustering of MV grids.
 
-   :property string db: Name of your database (e.g.``''oedb''``). eDisGo queries generator data from this database. Please note that this parameters is automatically overwritten in eDisGo's configuration files. 
-   :property string gridversion: ``null`` or *open_eGo* dataset version (e.g. ``''v0.4.5''``). If ``null``, *open_eGo*'s model_draft is used. Please note that this parameters is automatically overwritten in eDisGo's configuration files. 
-   :property string ding0_files: Path to the MV grid files (created by `ding0 <https://readthedocs.org/projects/dingo/>`_) (e.g. ``''data/MV_grids/20180713110719''``)
-   :property string choice_mode: Mode that eGo uses to chose MV grids out of the files in **ding0_files** (e.g. ``''manual''``, ``''cluster''`` or ``''all''``). If ``''manual''`` is chosen, the parameter **manual_grids** must contain a list of the desired grids. If ``''cluster''`` is chosen, **no_grids** must specify the desired number of clusters and **cluster_attributes** must specify the applied cluster attributes. If ``''all''`` is chosen, all MV grids from **ding0_files** are calculated.
-   :property list cluster_attributes: List of strings containing the desired cluster attributes. Available attributes are: ``''farthest_node''``, ``''wind_cap''``, ``''solar_cap''`` and ``''extended_storage''``, thus an exemplary list looks like ``["farthest_node", "wind_cap", "solar_cap", "extended_storage"]``. ``''farthest_node''`` represents the longest path within each grid, ``''wind_cap''`` the installed wind capacity within each grid, ``''solar_cap''`` the installed solar capacity within each grid and ``''extended_storage''`` the installed storage units (as calculated by eTraGo). Please note that ``''extended_storage''`` is only available in combination with eTraGo datasets that optimized storage extension. Otherwise this attribute is ignored.
+   :property string gridversion: This parameter is currently not used.
+   :property string grid_path: Path to the MV grid files (created by `ding0 <https://readthedocs.org/projects/dingo/>`_) (e.g. ``''data/MV_grids/20180713110719''``)
+   :property string choice_mode: Mode that eGo uses to chose MV grids out of the files in **grid_path** (e.g. ``''manual''``, ``''cluster''`` or ``''all''``). If ``''manual''`` is chosen, the parameter **manual_grids** must contain a list of the desired grids. If ``''cluster''`` is chosen, **no_grids** must specify the desired number of clusters and **cluster_attributes** must specify the applied cluster attributes. If ``''all''`` is chosen, all MV grids from **grid_path** are calculated.
+   :property list cluster_attributes: List of strings containing the desired cluster attributes. Available attributes are all attributes returned from :py:func:`~ego.mv_clustering.mv_clustering.get_cluster_attributes.
    :property bool only_cluster: If ``true``, eGo only identifies cluster results, but performs no eDisGo run. Please note that for **only_cluster** an eTraGo run or dataset must be provided.
-   :property list manual_grids: List of MV grid ID's (*open_eGo* HV/MV substation ID's) is case of **choice_mode** = ``''manual''`` (e.g. ``[1718,1719]``). Ohterwise this parameter is ignored.
-   :property int no_grids: Number of MV grid clusters (from all files in **ding0_files**, a specified number of representative clusters is calculated) in case of **choice_mode** = ``''cluster''``. Otherwise this parameter is ignored.
+   :property list manual_grids: List of MV grid ID's in case of **choice_mode** = ``''manual''`` (e.g. ``[1718,1719]``). Ohterwise this parameter is ignored.
+   :property int n_clusters: Number of MV grid clusters (from all grids in **grid_path**, a specified number of representative clusters is calculated) in case of **choice_mode** = ``''cluster''``. Otherwise this parameter is ignored.
    :property bool parallelization: If ``false``, eDisgo is used in a consecutive way (this may take very long time). In order to increase the performance of MV grid simulations, ``true`` allows the parallel calculation of MV grids. If **parallelization** = ``true``, **max_calc_time** and **max_workers** must be specified.
    :property float max_calc_time: Maximum calculation time in hours for eDisGo simulations. The calculation is terminated after this time and all costs are extrapolated based on the unfinished simulation. Please note that this parameter is only used if **parallelization** = ``true``.
    :property ing max_workers: Number of workers (cpus) that are allocated to the simulation. If the given value exceeds the number of available workers, it is reduced to the number of available workers. Please note that this parameter is only used if **parallelization** = ``true``.
-   :property bool initial_reinforcement: This parameter must be set ``true``.
-   :property bool apply_curtailment: If ``true``, eDisGo applies and optimizes the curtailment (as calculated by eTraGo) within each MV grid. 
-   :property float curtailment_voltage_threshold: p.u. overvoltage limit (e.g. ``0.05``). If this p.u. overvoltage is exceeded at any bus, curtailment is applied.
-   :property bool storage_distribution: If ``true``, eDisGo attempts to integrate battery storages (as calculated by eTraGo) into MV grids in order to reduce grid reinforcement. 
    :property float max_cos_phi_renewable: Maximum power factor for wind and solar generators in MV grids (e.g. ``0.9``). If the reactive power (as calculated by eTraGo) exceeds this power factor, the reactive power is reduced in order to reach the power factor conditions.
    :property string solver: Solver eDisGo uses to optimize the curtailment and storage integration (e.g. ``''gurobi''``).
-   :property string timesteps_pfa: Method eDisGo uses for the storage integration (e.g. ``''snapshot_analysis''``).
    :property string results: Path to folder where eDisGo's results will be saved.
-
+   :property list tasks: List of string defining the tasks to run. The eDisGo calculation for each MV grid can be devided into separate tasks which is helpful in case one tasks fails and calculations do not need to started in the beginning. The following tasks exist: ``''1_setup_grid''``, ``''2_specs_overlying_grid''``, ``''3_temporal_complexity_reduction''``, ``''4_optimisation''``, ``''5_grid_reinforcement''``.
+
 
 
 appl.py