From 72773814e16cd056bf91e3177c9b25ba604662b7 Mon Sep 17 00:00:00 2001 From: nesnoj Date: Sat, 29 May 2021 00:47:12 +0200 Subject: [PATCH 1/4] bump version --- doc/conf.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index c5c537ea..81b20d24 100644 --- 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/setup.py b/setup.py index ccfbfdaf..195ce247 100644 --- 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='jonathan.amme@rl-institut.de', description='DIstribution Network GeneratOr', From 0126ef4058e70dda32f3f5a0fa6534c4c6b396c9 Mon Sep 17 00:00:00 2001 From: nesnoj Date: Sat, 29 May 2021 00:50:47 +0200 Subject: [PATCH 2/4] set required egoio version to v0.4.8 --- ding0_env.yml | 2 +- requirements.txt | 2 +- rtd_requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ding0_env.yml b/ding0_env.yml index 7dcc587b..db211a37 100644 --- 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/requirements.txt b/requirements.txt index b1a49002..8004d363 100644 --- 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 index 2041e4ca..d3886de8 100644 --- 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 From 6f16fb95eb1ee1e6d549d98af3d5686be8cf440e Mon Sep 17 00:00:00 2001 From: nesnoj Date: Sat, 29 May 2021 00:57:48 +0200 Subject: [PATCH 3/4] update whatsnew --- doc/whatsnew.rst | 1 + doc/whatsnew/v0-2-1.rst | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 doc/whatsnew/v0-2-1.rst diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst index 0d567b1a..efc6224f 100644 --- 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 new file mode 100644 index 00000000..c1dedea4 --- /dev/null +++ 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) \ No newline at end of file From b4237fee0a626038a2b23da123a6779060f85200 Mon Sep 17 00:00:00 2001 From: nesnoj Date: Sat, 29 May 2021 01:04:51 +0200 Subject: [PATCH 4/4] fix logo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13be932c..3ec3db82 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + [![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)