diff --git a/VERSION b/VERSION index 3d26edf77..df1243329 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -__version__ = "0.4.1" +__version__ = "0.4.2" diff --git a/docs/changelog.rst b/docs/changelog.rst index b09d4c5d1..a36880a5e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -8,6 +8,7 @@ These are new features and improvements of note in each release :local: :backlinks: top +.. include:: whatsnew/v0-4-2.rst .. include:: whatsnew/v0-4-1.rst .. include:: whatsnew/v0-4-0.rst .. include:: whatsnew/v0-3-2.rst diff --git a/docs/conf.py b/docs/conf.py index 5d2f36b6d..db559d6ee 100644 --- 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' +version = release = '0.4.2' pygments_style = 'trac' templates_path = ['.'] diff --git a/docs/whatsnew/v0-4-2.rst b/docs/whatsnew/v0-4-2.rst index 5502a8678..79bc24c02 100644 --- a/docs/whatsnew/v0-4-2.rst +++ b/docs/whatsnew/v0-4-2.rst @@ -1,49 +1,4 @@ -v0.4.2 (???, 2020) +v0.4.2 (May, 11, 2021) ----------------------- - -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 +* Exclude Pyomo version 5.7.3, because this version causes an unusual high computing time to create a model. diff --git a/docs/whatsnew/v0-4-3.rst b/docs/whatsnew/v0-4-3.rst new file mode 100644 index 000000000..5502a8678 --- /dev/null +++ b/docs/whatsnew/v0-4-3.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 index 1961750c9..6dbd9b00c 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ def read(*names, **kwargs): setup( name="oemof.solph", - version="0.4.1", + version="0.4.2", license="MIT", description=( "A model generator for energy system modelling and optimisation." @@ -86,7 +86,7 @@ def read(*names, **kwargs): "dill", "numpy", "pandas", - "pyomo >= 5.7.0, < 6.0", + "pyomo >= 5.7.0, !=5.7.3", "networkx", "oemof.tools", "oemof.network", diff --git a/src/oemof/solph/__init__.py b/src/oemof/solph/__init__.py index fe1078357..ddc245205 100644 --- a/src/oemof/solph/__init__.py +++ b/src/oemof/solph/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.4.1" +__version__ = "0.4.2" from . import constraints # noqa: F401 from . import custom # noqa: F401