From 90bedec85efabdfb6b0f6de1d6e1a8c23a92608f Mon Sep 17 00:00:00 2001 From: gplessm Date: Thu, 19 Jul 2018 11:48:17 +0200 Subject: [PATCH 1/3] Update dependencies --- doc/whatsnew.rst | 1 + doc/whatsnew/v0-1-7.rst | 4 ++++ setup.py | 2 -- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 doc/whatsnew/v0-1-7.rst diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst index 3f002573..0e520079 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-1-7.rst .. include:: whatsnew/v0-1-6.rst .. include:: whatsnew/v0-1-5.rst .. include:: whatsnew/v0-1-4.rst diff --git a/doc/whatsnew/v0-1-7.rst b/doc/whatsnew/v0-1-7.rst new file mode 100644 index 00000000..1faaaf7b --- /dev/null +++ b/doc/whatsnew/v0-1-7.rst @@ -0,0 +1,4 @@ +Release v0.1.7 July ??, 2018 +++++++++++++++++++++++++++++ + +* Explicit dependencies of Pyomo and Scipy are removed \ No newline at end of file diff --git a/setup.py b/setup.py index 87245924..ac7359eb 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ install_requires=['networkx >= 1.11, <= 1.11', 'geopy >= 1.11.0, <= 1.11.0', 'pandas >= 0.20.3, <= 0.20.3', - 'pyomo >= 5.0.1, <= 5.1.1', 'pyproj >= 1.9.5.1, <= 1.9.5.1', 'sqlalchemy >= 1.0.11, <= 1.2.0', 'geoalchemy2 >= 0.2.6, <= 0.4.1', @@ -38,7 +37,6 @@ 'pypsa >= 0.11.0, <= 0.11.0', 'seaborn', 'unittest2', - 'scipy < 1.0', 'oedialect' ], package_data={ From 9c58591169447bcf476d64b0ab85913f9c0a2c68 Mon Sep 17 00:00:00 2001 From: gplessm Date: Thu, 19 Jul 2018 13:33:41 +0200 Subject: [PATCH 2/3] Get ready for the release --- doc/whatsnew/v0-1-7.rst | 4 +++- setup.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/whatsnew/v0-1-7.rst b/doc/whatsnew/v0-1-7.rst index 1faaaf7b..191503a7 100644 --- a/doc/whatsnew/v0-1-7.rst +++ b/doc/whatsnew/v0-1-7.rst @@ -1,4 +1,6 @@ -Release v0.1.7 July ??, 2018 +Release v0.1.7 July 19, 2018 ++++++++++++++++++++++++++++ +A release to update software dependencies. + * Explicit dependencies of Pyomo and Scipy are removed \ No newline at end of file diff --git a/setup.py b/setup.py index ac7359eb..054a9f2f 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup(name='ding0', - version='v0.1.7dev', + version='v0.1.7', author='Reiner Lemoine Institut, openego development group', author_email='jonathan.amme@rl-institut.de', description='DIstribution Network GeneratOr', From 2643d12a70485fb2e96b30ccad970d164c1c0294 Mon Sep 17 00:00:00 2001 From: gplessm Date: Thu, 19 Jul 2018 13:39:25 +0200 Subject: [PATCH 3/3] Getting ready for next phase of development - new dev version - What's new file created --- doc/whatsnew.rst | 1 + doc/whatsnew/v0-1-8.rst | 8 ++++++++ setup.py | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 doc/whatsnew/v0-1-8.rst diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst index 0e520079..5b650495 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-1-8.rst .. include:: whatsnew/v0-1-7.rst .. include:: whatsnew/v0-1-6.rst .. include:: whatsnew/v0-1-5.rst diff --git a/doc/whatsnew/v0-1-8.rst b/doc/whatsnew/v0-1-8.rst new file mode 100644 index 00000000..ad860d55 --- /dev/null +++ b/doc/whatsnew/v0-1-8.rst @@ -0,0 +1,8 @@ +Release v0.1.8 ??? ??, 2018 +++++++++++++++++++++++++++++ + + + +Changes +------- + diff --git a/setup.py b/setup.py index 054a9f2f..f59ec94a 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup(name='ding0', - version='v0.1.7', + version='v0.1.8dev', author='Reiner Lemoine Institut, openego development group', author_email='jonathan.amme@rl-institut.de', description='DIstribution Network GeneratOr',