Merge branch 'main' into dev

oemof · Feb 23, 2024 · 72463c6 · 72463c6
2 parents 554549a + 4b223d1
commit 72463c6
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 22 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,6 +7,13 @@ Changelog
 Unreleased
 ----------
 
+Features
+
+Fixes
+
+
+0.0.5 Patch Release - Miraculous Mary (2024-02-23)
+-----------------------------------------------------
 
 Features
 
@@ -18,7 +25,9 @@ Fixes
 
 * Remove specific dirs from flake8 & isort `#136 <https://github.com/oemof/oemof-tabular/pull/136>`_
 * Update lp-files to pyomo6.7 `#148 <https://github.com/oemof/oemof-tabular/pull/148>`_
-* Fix oemof.solph version to v0.5.2dev1 `#159 <https://github.com/oemof/oemof-tabular/pull/159>`_
+* Rework periodic value deserialization `#154 <https://github.com/oemof/oemof-tabular/pull/154>`_
+* Fix oemof.solph version to v0.5.2dev1 `#157 <https://github.com/oemof/oemof-tabular/pull/157>`_
+* Fix oemof.solph version to v0.5.2.dev1 `#159 <https://github.com/oemof/oemof-tabular/pull/159>`_
 
 
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -43,10 +43,10 @@
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'oemof.tabular'
-year = '2018'
-author = 'Stephan Günther'
+year = '2023'
+author = 'Stephan Günther, Jann Launer, Julian Endres, Hendrik Huyskens'
 copyright = '{0}, {1}'.format(year, author)
-version = release = '0.0.5dev'
+version = release = '0.0.5'
 
 pygments_style = 'trac'
 templates_path = ['.']

diff --git a/punch_version.py b/punch_version.py
@@ -1,4 +1,4 @@
 major = 0
 minor = 0
 patch = 5
-status = "dev"
+status = ""
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def read(*names, **kwargs):
 
 setup(
     name="oemof.tabular",
-    version="0.0.5dev",
+    version="0.0.5",
     license="BSD 3-Clause License",
     description="Load oemof energy systems from tabular data sources.",
     long_description="%s\n%s"
@@ -30,7 +30,7 @@ def read(*names, **kwargs):
         ),
         re.sub(":[a-z]+:`~?(.*?)`", r"``\1``", read("CHANGELOG.rst")),
     ),
-    author="Stephan Günther, Simon Hilpert, Martin Söthe",
+    author="Stephan Günther, Simon Hilpert, Martin Söthe, Jann Launer, Hendrik Huyskens, Julian Endres, Felix Maurer",
     author_email="[email protected]",
     url="https://github.com/oemof/oemof-tabular",
     packages=["oemof"] + ["oemof." + p for p in find_packages("src/oemof")],

diff --git a/src/oemof/tabular/__init__.py b/src/oemof/tabular/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.0.5dev"
+__version__ = "0.0.5"
 __project__ = "oemof.tabular"
 
 

diff --git a/src/oemof/tabular/config/config.py b/src/oemof/tabular/config/config.py
@@ -24,5 +24,5 @@
     "0.0.2",
     "0.0.3",
     "0.0.4",
-    "0.0.5dev",
+    "0.0.5",
 ]
diff --git a/src/oemof/tabular/examples/datapackages/dispatch/datapackage.json b/src/oemof/tabular/examples/datapackages/dispatch/datapackage.json
@@ -1,7 +1,7 @@
 {
     "profile": "tabular-data-package",
     "name": "oemof-tabular-dispatch-example",
-    "oemof_tabular_version": "0.0.5dev",
+    "oemof_tabular_version": "0.0.5",
     "resources": [
         {
             "path": "data/elements/bus.csv",
@@ -435,4 +435,4 @@
             }
         }
     ]
-}
+}
diff --git a/src/oemof/tabular/examples/datapackages/dispatch_multi_period/datapackage.json b/src/oemof/tabular/examples/datapackages/dispatch_multi_period/datapackage.json
@@ -1,7 +1,7 @@
 {
     "profile": "tabular-data-package",
     "name": "oemof-tabular-dispatch-example",
-    "oemof_tabular_version": "0.0.5dev",
+    "oemof_tabular_version": "0.0.5",
     "resources": [
         {
             "path": "data/elements/bus.csv",
@@ -465,4 +465,4 @@
             }
         }
     ]
-}
+}
diff --git a/...emof/tabular/examples/datapackages/dispatch_multi_period_periodic_values/datapackage.json b/...emof/tabular/examples/datapackages/dispatch_multi_period_periodic_values/datapackage.json
@@ -1,7 +1,7 @@
 {
     "profile": "tabular-data-package",
     "name": "oemof-tabular-dispatch-example",
-    "oemof_tabular_version": "0.0.5dev",
+    "oemof_tabular_version": "0.0.5",
     "resources": [
         {
             "path": "data/elements/bus.csv",

diff --git a/src/oemof/tabular/examples/datapackages/emission_constraint/datapackage.json b/src/oemof/tabular/examples/datapackages/emission_constraint/datapackage.json
@@ -1,7 +1,7 @@
 {
     "profile": "tabular-data-package",
     "name": "oemof-tabular-dispatch-example",
-    "oemof_tabular_version": "0.0.5dev",
+    "oemof_tabular_version": "0.0.5",
     "resources": [
         {
             "path": "data/elements/bus.csv",
@@ -438,4 +438,4 @@
             }
         }
     ]
-}
+}
diff --git a/src/oemof/tabular/examples/datapackages/foreignkeys/datapackage.json b/src/oemof/tabular/examples/datapackages/foreignkeys/datapackage.json
@@ -1,7 +1,7 @@
 {
     "profile": "tabular-data-package",
     "name": "oemof-tabular-foreignkeys-examples",
-    "oemof_tabular_version": "0.0.5dev",
+    "oemof_tabular_version": "0.0.5",
     "resources": [
         {
             "path": "data/elements/bus.csv",
@@ -183,4 +183,4 @@
             }
         }
     ]
-}
+}
diff --git a/src/oemof/tabular/examples/datapackages/investment/datapackage.json b/src/oemof/tabular/examples/datapackages/investment/datapackage.json
@@ -1,7 +1,7 @@
 {
     "profile": "tabular-data-package",
     "name": "renpass-invest-example",
-    "oemof_tabular_version": "0.0.5dev",
+    "oemof_tabular_version": "0.0.5",
     "resources": [
         {
             "path": "data/elements/bus.csv",
@@ -571,4 +571,4 @@
             }
         }
     ]
-}
+}
diff --git a/src/oemof/tabular/examples/datapackages/investment_multi_period/datapackage.json b/src/oemof/tabular/examples/datapackages/investment_multi_period/datapackage.json
@@ -1,7 +1,7 @@
 {
     "profile": "tabular-data-package",
     "name": "renpass-invest-example",
-    "oemof_tabular_version": "0.0.5dev",
+    "oemof_tabular_version": "0.0.5",
     "resources": [
         {
             "path": "data/elements/bus.csv",
@@ -672,4 +672,4 @@
             }
         }
     ]
-}
+}