Skip to content

Commit

Permalink
Merge pull request #295 from openego/release-0.7.2
Browse files Browse the repository at this point in the history
Release 0.7.2
  • Loading branch information
ulfmueller authored Jun 15, 2020
2 parents 799c853 + e2a4ba2 commit fdb6a98
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 11 deletions.
12 changes: 8 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ eTraGo is designed as a Python package therefore it is mandatory to have
`Python 3 <https://www.python.org/downloads/.>`_ installed. If you have a
working Python3 environment, use pypi to install the latest eTraGo version.
We highly recommend you to use a virtual environment. Use following pip
command in order to install eTraGo:
command in order to install eTraGo. Be sure having the pip version
18.1 installed (pip3 install pip==18.1) since newer versions do not
permit using dependency links.

.. code-block:: bash
$ pip3 install eTraGo
$ pip3 install eTraGo --process-dependency-links
Installation for Developers
===========================
Expand All @@ -42,11 +44,13 @@ You can checkout to the dev branch and create new feature branches.
For the correct work-flow, please mind the
`Dreissen Branching Model <https://nvie.com/posts/a-successful-git-branching-model/>`_

Use the pip -e to install eTraGo directly from the cloned repository:
Use the pip -e to install eTraGo directly from the cloned repository (Be sure having the pip version
18.1 installed (pip3 install pip==18.1) since newer versions do not permit using dependency links!):

.. code-block::
$ pip3 install -e /path/to/eTraGo/
$ pip3 install -e /path/to/eTraGo/ --process-dependency-links
Using a virtual environment
===========================
Expand Down
6 changes: 4 additions & 2 deletions doc/developer_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ You can checkout to the dev branch and create new feature branches.
For the correct work-flow, please mind the
`Dreissen Branching Model <https://nvie.com/posts/a-successful-git-branching-model/>`_

3. Use the pip -e to install eTraGo directly from the cloned repository:
3. Use the pip -e to install eTraGo directly from the cloned repository (Be sure having the pip version
18.1 installed (pip3 install pip==18.1) since newer versions do not permit using dependency links!):

.. code-block:: bash
$ pip3 install -e /path/to/eTraGo/
$ pip3 install -e /path/to/eTraGo/ --process-dependency-links
11 changes: 7 additions & 4 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ eTraGo is designed as a Python package therefore it is mandatory to have
`Python 3 <https://www.python.org/downloads/.>`_ installed. If you have a
working Python3 environment, use pypi to install the latest eTraGo version.
We highly recommend you to use a virtual environment. Use following pip
command in order to install eTraGo:
command in order to install eTraGo. Be sure having the pip version
18.1 installed (pip3 install pip==18.1) since newer versions do not
permit using dependency links.

.. code-block:: bash
$ pip3 install eTraGo
$ pip3 install eTraGo --process-dependency-links
Using a virtual environment
Expand Down Expand Up @@ -47,10 +49,11 @@ prompt as administrator and run:

.. code-block:: bash
$ conda install pip
$ conda install pip==18.1
$ conda config --add channels conda-forge
$ conda install shapely
$ pip3 install eTraGo
$ pip3 install eTraGo --process-dependency-links
The full Documentation can be found
`on this page <https://docs.anaconda.com/anaconda/install/>`_ . We use Anaconda
Expand Down
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'numpy == 1.16.2',
'scikit-learn == 0.19.0',
'pandas >= 0.19.0, <=0.20.3',
'pypsa @ git+https://github.com/openego/PyPSA.git@master#egg=pypsa-0.11.0fork',
'pypsa==0.11.0fork',
'sqlalchemy == 1.2.0',
'geoalchemy2 >= 0.3.0, <=0.4.0',
'matplotlib == 3.0.3',
Expand All @@ -34,6 +34,9 @@
'oedialect',
'pyproj == 2.0.2',
'tilemapbase == 0.4.5'],
dependency_links=[
('git+https://git@github.com/openego/PyPSA.git'
'@master#egg=pypsa-0.11.0fork')],
extras_require={
'docs': [
'sphinx >= 1.4',
Expand Down

0 comments on commit fdb6a98

Please sign in to comment.