Merge branch 'dev' into fix/#266-provide_powerfactor_mode

openego · Jul 19, 2018 · 88ba30a · 88ba30a
2 parents 6c86c02 + 2643d12
commit 88ba30a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst
@@ -8,6 +8,8 @@ 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
 .. include::  whatsnew/v0-1-4.rst

diff --git a/doc/whatsnew/v0-1-7.rst b/doc/whatsnew/v0-1-7.rst
@@ -0,0 +1,6 @@
+Release v0.1.7 July 19, 2018
+++++++++++++++++++++++++++++
+
+A release to update software dependencies.
+
+* Explicit dependencies of Pyomo and Scipy are removed
diff --git a/doc/whatsnew/v0-1-8.rst b/doc/whatsnew/v0-1-8.rst
@@ -0,0 +1,8 @@
+Release v0.1.8 ??? ??, 2018
+++++++++++++++++++++++++++++
+
+<summary>
+
+Changes
+-------
+
diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 
 
 setup(name='ding0',
-      version='v0.1.7dev',
+      version='v0.1.8dev',
       author='Reiner Lemoine Institut, openego development group',
       author_email='jonathan.amme@rl-institut.de',
       description='DIstribution Network GeneratOr',
@@ -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={