Merge 4c816b3 into 7fcde75

reegis · Mar 18, 2021 · d51a9e6 · d51a9e6
2 parents 7fcde75 + 4c816b3
commit d51a9e6
Show file tree

Hide file tree

Showing 98 changed files with 5,197 additions and 160,855 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -2,4 +2,4 @@
 Authors
 =======
 
-* Uwe Krien - https://www.uni-bremen.de/en/res/team/dipl-ing-uwe-krien
+* Uwe Krien - `University of Bremen <https://www.uni-bremen.de/en/res/team/dr-ing-uwe-krien>`_
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -6,7 +6,7 @@ Contributions are welcome, and they are greatly appreciated! Every
 little bit helps, and credit will always be given.
 
 Bug reports
-===========
+-----------
 
 When `reporting a bug <https://github.com/reegis/deflex/issues>`_ please include:
 
@@ -15,14 +15,14 @@ When `reporting a bug <https://github.com/reegis/deflex/issues>`_ please include
     * Detailed steps to reproduce the bug.
 
 Documentation improvements
-==========================
+--------------------------
 
 deflex could always use more documentation, whether as part of the
 official deflex docs, in docstrings, or even on the web in blog posts,
 articles, and such.
 
 Feature requests and feedback
-=============================
+-----------------------------
 
 The best way to send feedback is to file an issue at https://github.com/reegis/deflex/issues.
 
@@ -33,7 +33,7 @@ If you are proposing a feature:
 * Remember that this is a volunteer-driven project, and that code contributions are welcome :)
 
 Development
-===========
+-----------
 
 To set up `deflex` for local development:
 
@@ -88,3 +88,28 @@ To run a subset of tests::
 To run all the test environments in *parallel*::
 
     tox -p auto
+
+Development
+-----------
+
+To run all the tests run::
+
+    tox
+
+Note, to combine the coverage data from all the tox environments run:
+
+.. list-table::
+    :widths: 10 90
+    :stub-columns: 1
+
+    - - Windows
+      - ::
+
+            set PYTEST_ADDOPTS=--cov-append
+            tox
+
+    - - Other
+      - ::
+
+            PYTEST_ADDOPTS=--cov-append tox
+
diff --git a/README.rst b/README.rst
@@ -1,30 +1,14 @@
+.. start-badges
+
 | |workflow_pytests| |workflow_checks| |coveralls| |docs| |packaging|
 | |lgt_general| |lgt_alerts| |codacy| |requires|
 
 \
 
-
 | |version| |wheel| |supported-versions| |supported-implementations|
 | |commits-since| |licence| |code_Style| |zenodo|
 
 
-------------------------------------------------
-
-\
-
-.. image:: https://raw.githubusercontent.com/reegis/deflex/master/docs/images/logo_deflex_big.svg
-    :target: https://github.com/reegis/deflex
-    :width: 600pt
-
-deflex - flexible multi-regional energy system model for heat, power and mobility
-=================================================================================
-
-* Multi sectoral energy system of Germany/Europe
-* Dispatch optimisation
-* Start with basic scenarios
-* Highly configurable and adaptable
-
-
 .. |docs| image:: https://readthedocs.org/projects/deflex/badge/?style=flat
     :target: https://readthedocs.org/projects/deflex
     :alt: Documentation Status
@@ -85,73 +69,44 @@ deflex - flexible multi-regional energy system model for heat, power and mobilit
    :target: https://doi.org/10.5281/zenodo.3572594
 
 
-Installation
-============
-
-The following line will install the basic version. Some functions depend on further packages, see below to install additional requirements::
-
-    pip install deflex
-
-To run older scenarios you can install the old stable phd version::
-
-    pip install https://github.com/reegis/deflex/archive/phd.zip
-
-
-Installation of a solver (mandatory)
-------------------------------------
-
-To solve an energy system a linear solver has to be installed. For the
-communication with the solver `Pyomo` is used. Have a look at the `Pyomo docs <https://pyomo.readthedocs.io/en/stable/solving_pyomo_models.html#supported-solvers>`_ to learn about which solvers are supported.
-
-The default solver is the CBC solver. Go to the `oemof.solph documentation
-<https://oemof-solph.readthedocs.io/en/latest/readme.html#installing-a-solver>`_
-to get help for the solver installation.
-
-
-Additional requirements (optional)
-----------------------------------
-
-The basic installation can be used to compute scenarios (csv, xls, xlsx). For
-some functions additional packages are needed.
+------------------------------------------------
 
-1. To run the example with all plots you need the following packages:
-    * pygeos (spatial operations)
-    * geopandas (maps)
-    * descartes (plot maps with matplotlib)
-    * lmfit (linear fit)
-    * matplotlib (plotting)
-    * requests (download example files)
+.. end-badges
 
-    ``pip install deflex[example]``
+\
 
-2. To use the maps of the polygons, transmission lines etc.:
-    * pygeos (spatial operations)
-    * geopandas (maps)
+.. image:: https://raw.githubusercontent.com/reegis/deflex/master/docs/images/logo_deflex_big.svg
+    :target: https://github.com/reegis/deflex
+    :width: 600pt
 
-    ``pip install deflex[map]``
+=================================================================================
+deflex - flexible multi-regional energy system model for heat, power and mobility
+=================================================================================
 
-3. To develop deflex:
-    * pytest
-    * sphinx
-    * sphinx_rtd_theme
-    * pygeos
-    * geopandas
-    * requests
+The following README gives you a brief overview about deflex. Read the full
+`documentation <https://deflex.readthedocs.io/en/latest/>`_ for all
+information.
 
-    ``pip install deflex[dev]``
+* Multi sectoral energy system of Germany/Europe
+* Dispatch optimisation
+* Start with basic scenarios
+* Highly configurable and adaptable
 
+Installation
+------------
 
-Basic usage
-===========
+To run `deflex` you have to install the Python package and a solver:
 
-.. code-block:: python
+* deflex is available on `PyPi <https://pypi.org/project/deflex/>`_ and can be
+  installed using ``pip install deflex``.
+* an LP-solver is needed such as CBC (default), GLPK, Gurobi*, Cplex*
+* for some extra functions additional packages and are needed
 
-    scenario = "/path/to/my/scenario.xls"
-    main.model_scenario(scenario)
+\* Proprietary solver
 
 
 Use example
-===========
+-----------
 
 1. Run ``pip install deflex[example]``
 2. Create a local directory (e.g. /home/user/deflex_examples).
@@ -169,52 +124,56 @@ Use example
     - BASEPATH = os.path.join(os.path.expanduser("~"), "deflex_examples")
     + BASEPATH = "/your/favoured/path/"
 
-Documentation
-=============
-
-
-https://deflex.readthedocs.io/
-
-The `documentation of deflex <https://deflex.readthedocs.io/en/latest/>`_ is powered by readthedocs.
 
-Go to the `download page <http://readthedocs.org/projects/deflex/downloads/>`_ to download different versions and formats (pdf, html, epub) of the documentation.
+Improve deflex
+--------------
 
+We are warmly welcoming all who want to contribute to the deflex library. This
+includes the following actions:
 
-
-Contributing
-==============
-
-We are warmly welcoming all who want to contribute to the deflex library.
+* Write bug reports or comments
+* Improve the documentation (including typos, grammar)
+* Add features improve the code (open an issue first)
 
 
 Citing deflex
-========================
+-------------
 
 Go to the `Zenodo page of deflex <https://doi.org/10.5281/zenodo.3572594>`_ to find the DOI of your version. To cite all deflex versions use:
 
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3572594.svg
    :target: https://doi.org/10.5281/zenodo.3572594
 
-Development
-===========
 
-To run all the tests run::
+Documentation
+-------------
 
-    tox
+The `full documentation of deflex <https://deflex.readthedocs.io/en/latest/>`_
+is available on readthedocs.
 
-Note, to combine the coverage data from all the tox environments run:
+Go to the `download page <http://readthedocs.org/projects/deflex/downloads/>`_
+to download different versions and formats (pdf, html, epub) of the
+documentation.
 
-.. list-table::
-    :widths: 10 90
-    :stub-columns: 1
+License
+-------
 
-    - - Windows
-      - ::
+Copyright (c) 2019 Uwe Krien
 
-            set PYTEST_ADDOPTS=--cov-append
-            tox
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-    - - Other
-      - ::
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-            PYTEST_ADDOPTS=--cov-append tox
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -1 +1,3 @@
+.. _contributing:
+
 .. include:: ../CONTRIBUTING.rst
diff --git a/docs/getting_started.rst b/docs/getting_started.rst