Merge branch 'master' of github.com:oemof/oemof

oemof · Mar 28, 2017 · b27b72a · b27b72a
2 parents 013e11f + 738d038
commit b27b72a
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 42 deletions.
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"
 
diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -8,7 +8,7 @@ These are new features and improvements of note in each release
     :local:
     :backlinks: top
 
-.. include::  whatsnew/v0-1-3.rst
+.. include::  whatsnew/v0-1-4.rst
 .. include::  whatsnew/v0-1-2.rst 
 .. include::  whatsnew/v0-1-1.rst  
 .. include::  whatsnew/v0-1-0.rst    

diff --git a/doc/whatsnew/v0-1-3.rst b/doc/whatsnew/v0-1-3.rst
diff --git a/doc/whatsnew/v0-1-4.rst b/doc/whatsnew/v0-1-4.rst
@@ -1,32 +1,18 @@
-v0.1.3dev ()
+v0.1.3 (March 28, 2017)
 ++++++++++++++++++++++++++
 
-
-API changes
-###########
-
-
-New features
-############
-
-
-Documentation
-#############
-
-
 Bug fixes
 #########
 
+* fix examples (`issue #298 <https://github.com/oemof/oemof_base/issues/298>`_)
 
-Testing
-#######
-
-
-Other changes
+Documentation
 #############
 
-
+* Adapt installation guide.
 
 Contributors
 ############
-
+
+ * Uwe Krien
+ * Stephan Günther
diff --git a/doc/whatsnew/v0-1-5.rst b/doc/whatsnew/v0-1-5.rst
@@ -0,0 +1,32 @@
+v0.1.3dev ()
+++++++++++++++++++++++++++
+
+
+API changes
+###########
+
+
+New features
+############
+
+
+Documentation
+#############
+
+
+Bug fixes
+#########
+
+
+Testing
+#######
+
+
+Other changes
+#############
+
+
+
+Contributors
+############
+
diff --git a/oemof/__init__.py b/oemof/__init__.py
@@ -1,4 +1,4 @@
 from pkgutil import extend_path
 __path__ = extend_path(__path__, __name__)
 
-__version__ = '0.1.3'
+__version__ = '0.1.4'
diff --git a/setup.py b/setup.py
@@ -38,6 +38,7 @@ def read(fname):
                            'scenarios',
                            '*.csv'),
               os.path.join('solph', 'simple_dispatch','*.csv'),
+              os.path.join('solph', 'variable_chp','*.csv'),
               os.path.join('solph', 'storage_investment','*.csv')
           ],
             'oemof': [os.path.join('tools', 'default_files', '*.ini')]},