Merge pull request #353 from openego/dev

Release v0.2.1 (fix PyPI issue)
openego · May 28, 2021 · 0e0e115 · 0e0e115
2 parents 4454425 + b4237fe
commit 0e0e115
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<img align="right" width="300" height="300" src="https://github.com/openego/ding0/blob/dev/doc/images/DING0_Logo_300px.png">
+<img align="right" width="300" height="300" src="https://raw.githubusercontent.com/openego/ding0/dev/doc/images/DING0_Logo_300px.png">
 
 [![Documentation Status](https://readthedocs.org/projects/ding0/badge/?version=dev)](http://dingo.readthedocs.io/en/dev)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.834751.svg)](https://doi.org/10.5281/zenodo.834751)

diff --git a/ding0_env.yml b/ding0_env.yml
@@ -36,6 +36,6 @@ dependencies:
     - conda-forge::libgdal
 
     - pip:
-        - egoio >= 0.4.5
+        - egoio == 0.4.8
         - oedialect == 0.0.10
         - pypsa >= 0.11.0, <= 0.17.1
diff --git a/doc/conf.py b/doc/conf.py
@@ -124,7 +124,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.0'
+version = '0.2.1'
 # The full version, including alpha/beta/rc tags.
 #release = '0.1.10'
 

diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst
@@ -8,6 +8,7 @@ See what's new as per release!
     :local:
     :backlinks: top
 
+.. include::  whatsnew/v0-2-1.rst
 .. include::  whatsnew/v0-2-0.rst
 .. include::  whatsnew/v0-1-12.rst
 .. include::  whatsnew/v0-1-10.rst

diff --git a/doc/whatsnew/v0-2-1.rst b/doc/whatsnew/v0-2-1.rst
@@ -0,0 +1,7 @@
+Release v0.2.1 (May 29, 2021)
++++++++++++++++++++++++++++++
+
+Changes
+-------
+
+Release to fix ego.io dependency in v0.2.0 (PyPI did not accept git link)
diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,7 @@ pyproj == 3.0.1
 sqlalchemy <= 1.3.24
 geoalchemy2 == 0.6.3
 matplotlib >= 1.5.3, <= 3.4.2
-egoio @ git+https://github.com/openego/ego.io.git@ab327e3c8bdb53b5205af84b41b02700f6d3fb20#egg=egoio
+egoio == 0.4.8
 shapely == 1.7.1
 pypsa >= 0.11.0, <= 0.17.1
 seaborn == 0.11.1

diff --git a/rtd_requirements.txt b/rtd_requirements.txt
@@ -6,7 +6,7 @@ pyproj == 3.0.1
 sqlalchemy <= 1.3.24
 geoalchemy2 == 0.6.3
 matplotlib >= 1.5.3, <= 3.4.2
-egoio >=0.4.7
+egoio == 0.4.8
 pypsa >= 0.11.0, <= 0.17.1
 seaborn == 0.11.1
 unittest2 == 1.1.0

diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@ def read(fname):
     long_description = f.read()
 
 setup(name='ding0',
-      version='v0.2.0',
+      version='v0.2.1',
       author='Reiner Lemoine Institut',
       author_email='[email protected]',
       description='DIstribution Network GeneratOr',