Merge pull request #260 from openego/dev

Release v0.1.5
openego · Jun 6, 2018 · 6d22907 · 6d22907
2 parents 2892e11 + 028e341
commit 6d22907
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/ding0/config/config_db_tables.cfg b/ding0/config/config_db_tables.cfg
@@ -24,7 +24,7 @@ mv_stations = EgoDpHvmvSubstation
 lv_stations = EgoDpMvlvSubstation
 re_generators = t_ego_dp_res_powerplant_sq_mview
 conv_generators = t_ego_dp_conv_powerplant_sq_mview
-version = v0.3.0
+version = v0.4.0
 
 [input_data_source]
 input_data = model_draft
diff --git a/ding0/core/__init__.py b/ding0/core/__init__.py
@@ -40,6 +40,7 @@
 from shapely.geometry import Point, MultiPoint, MultiLineString, LineString
 from shapely.geometry import shape, mapping
 import subprocess
+import oedialect
 
 logger = logging.getLogger('ding0')
 

diff --git a/ding0/examples/example_parallel_multiple_grid_districts.py b/ding0/examples/example_parallel_multiple_grid_districts.py
@@ -29,6 +29,7 @@
 import pandas as pd
 import json
 from sqlalchemy.orm import sessionmaker
+import oedialect
 
 
 BASEPATH = os.path.join(os.path.expanduser('~'), '.ding0')

diff --git a/ding0/examples/example_single_grid_district.py b/ding0/examples/example_single_grid_district.py
@@ -25,6 +25,7 @@
 from ding0.tools.logger import setup_logger
 from ding0.tools.results import save_nd_to_pickle
 from sqlalchemy.orm import sessionmaker
+import oedialect
 
 # define logger
 logger = setup_logger()

diff --git a/doc/whatsnew/v0-1-5-beta.rst b/doc/whatsnew/v0-1-5-beta.rst
@@ -0,0 +1,11 @@
+Release v0.1.5 (May 15, 2018)
+++++++++++++++++++++++++++++++++++
+
+This release provides an update of API docs.
+
+* Update docs: API docs now build properly  from a technical perspective
+  `#45 <https://github.com/openego/ding0/issues/45>`_.
+  The content is still not complete
+* Added new generator object GeneratorFluctuating that includes a
+  weather_cell_id
+  `#254 <https://github.com/openego/ding0/issues/254>`_
diff --git a/doc/whatsnew/v0-1-5.rst b/doc/whatsnew/v0-1-5.rst
@@ -1,4 +1,4 @@
-Release v0.1.5 (April ??, 2018)
+Release v0.1.5 (June 6, 2018)
 ++++++++++++++++++++++++++++++++++
 
 This release provides an update of API docs.
@@ -9,3 +9,4 @@ This release provides an update of API docs.
 * Added new generator object GeneratorFluctuating that includes a
   weather_cell_id
   `#254 <https://github.com/openego/ding0/issues/254>`_
+* Include `oedialect <https://github.com/openego/oedialect>`_
diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 
 
 setup(name='ding0',
-      version='v0.1.5-beta',
+      version='v0.1.5',
       author='Reiner Lemoine Institut, openego development group',
       author_email='[email protected]',
       description='DIstribution Network GeneratOr',
@@ -33,12 +33,13 @@
                         'sqlalchemy >= 1.0.11, <= 1.2.0',
                         'geoalchemy2 >= 0.2.6, <= 0.4.1',
                         'matplotlib  >= 1.5.3, <= 1.5.3',
-                        'egoio==0.3.1',
+                        'egoio==0.4.0',
                         'shapely >= 1.5.12, <= 1.6.3',
                         'pypsa >= 0.11.0, <= 0.11.0',
                         'seaborn',
                         'unittest2',
-                        'scipy < 1.0'
+                        'scipy < 1.0',
+                        'oedialect'
                         ],
       package_data={
           'ding0': [