Prepare v0.4.1 release

oemof · Jun 24, 2020 · 8efb208 · 8efb208
1 parent f091a2c
commit 8efb208
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 40 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,7 +2,12 @@
 Changelog
 =========
 
-0.4.0.b0 (2020-05-12)
------------------------
+0.4.0 (2020-06-04)
+------------------
 
 * First release of oemof.solph on PyPI.
+
+0.4.1 (2020-06-24)
+------------------
+
+* Fixed incompatibility with recent Pyomo release (5.7)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-__version__ = "0.4.0.dev0"
+__version__ = "0.4.1"
diff --git a/docs/conf.py b/docs/conf.py
@@ -22,7 +22,7 @@
 year = '2014-2020'
 author = 'oemof-developer-group'
 copyright = '{0}, {1}'.format(year, author)
-version = release = '0.4.1.dev0'
+version = release = '0.4.1'
 
 pygments_style = 'trac'
 templates_path = ['.']

diff --git a/docs/whatsnew/v0-4-1.rst b/docs/whatsnew/v0-4-1.rst
@@ -1,28 +1,6 @@
-v0.4.1 (???, 2020)
+v0.4.1 (June 24, 2020)
 -----------------------
 
-
-API changes
-^^^^^^^^^^^^^^^^^^^^
-
-* something
-
-
-New features
-^^^^^^^^^^^^^^^^^^^^
-
-* something
-
-New components/constraints
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* something
-
-Documentation
-^^^^^^^^^^^^^^^^^^^^
-
-* something
-
 Bug fixes
 ^^^^^^^^^^^^^^^^^^^^
 
@@ -36,17 +14,6 @@ Known issues
     results, the scalars of the results is stored in the dict of the sequences.
     (See `Issue #693 <https://github.com/oemof/oemof-solph/issues/693>`_)
 
-
-Testing
-^^^^^^^^^^^^^^^^^^^^
-
-* something
-
-Other changes
-^^^^^^^^^^^^^^^^^^^^
-
-* something
-
 Contributors
 ^^^^^^^^^^^^^^^^^^^^
 

diff --git a/docs/whatsnew/v0-4-2.rst b/docs/whatsnew/v0-4-2.rst
@@ -0,0 +1,49 @@
+v0.4.2 (???, 2020)
+-----------------------
+
+
+API changes
+^^^^^^^^^^^^^^^^^^^^
+
+* something
+
+
+New features
+^^^^^^^^^^^^^^^^^^^^
+
+* something
+
+New components/constraints
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* something
+
+Documentation
+^^^^^^^^^^^^^^^^^^^^
+
+* something
+
+Bug fixes
+^^^^^^^^^^^^^^^^^^^^
+
+* something
+
+Known issues
+^^^^^^^^^^^^^^^^^^^^
+
+* something
+
+Testing
+^^^^^^^^^^^^^^^^^^^^
+
+* something
+
+Other changes
+^^^^^^^^^^^^^^^^^^^^
+
+* something
+
+Contributors
+^^^^^^^^^^^^^^^^^^^^
+
+* something
diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@ def read(*names, **kwargs):
 
 setup(
     name="oemof.solph",
-    version="0.4.1.dev0",
+    version="0.4.1",
     license="MIT",
     description=(
         "A model generator for energy system modelling and optimisation."

diff --git a/src/oemof/solph/__init__.py b/src/oemof/solph/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.4.1.dev0"
+__version__ = "0.4.1"
 
 from . import constraints  # noqa: F401
 from . import custom  # noqa: F401