From 20376cfb67e4d7ee5d0200046c65065c63e0bd5b Mon Sep 17 00:00:00 2001 From: "Julian.Endres" Date: Fri, 23 Feb 2024 18:15:48 +0100 Subject: [PATCH 1/4] Bump version to 0.0.5 --- docs/conf.py | 6 +++--- punch_version.py | 2 +- setup.py | 2 +- src/oemof/tabular/__init__.py | 2 +- src/oemof/tabular/config/config.py | 2 +- .../tabular/examples/datapackages/dispatch/datapackage.json | 4 ++-- .../datapackages/dispatch_multi_period/datapackage.json | 4 ++-- .../dispatch_multi_period_periodic_values/datapackage.json | 2 +- .../datapackages/emission_constraint/datapackage.json | 4 ++-- .../examples/datapackages/foreignkeys/datapackage.json | 4 ++-- .../examples/datapackages/investment/datapackage.json | 4 ++-- .../datapackages/investment_multi_period/datapackage.json | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 162e101b..e996c55c 100644 --- 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 index 751af8eb..5ff7425d 100644 --- 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 index 1635cd8f..3713f52c 100644 --- 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" diff --git a/src/oemof/tabular/__init__.py b/src/oemof/tabular/__init__.py index 7a39a30c..a44593e6 100644 --- 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 index 1a029b93..b7948cd5 100644 --- 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 index ac3b19d3..3d9e7efd 100644 --- 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 @@ } } ] -} \ No newline at end of file +} diff --git a/src/oemof/tabular/examples/datapackages/dispatch_multi_period/datapackage.json b/src/oemof/tabular/examples/datapackages/dispatch_multi_period/datapackage.json index f6626f73..da53497d 100644 --- 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 @@ } } ] -} \ No newline at end of file +} diff --git a/src/oemof/tabular/examples/datapackages/dispatch_multi_period_periodic_values/datapackage.json b/src/oemof/tabular/examples/datapackages/dispatch_multi_period_periodic_values/datapackage.json index b6a9349c..bb7b3735 100644 --- a/src/oemof/tabular/examples/datapackages/dispatch_multi_period_periodic_values/datapackage.json +++ b/src/oemof/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 index 9315c35a..60773d3e 100644 --- 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 @@ } } ] -} \ No newline at end of file +} diff --git a/src/oemof/tabular/examples/datapackages/foreignkeys/datapackage.json b/src/oemof/tabular/examples/datapackages/foreignkeys/datapackage.json index 2cee5a41..0d22abc4 100644 --- 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 @@ } } ] -} \ No newline at end of file +} diff --git a/src/oemof/tabular/examples/datapackages/investment/datapackage.json b/src/oemof/tabular/examples/datapackages/investment/datapackage.json index 40268b87..514bc3dd 100644 --- 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 @@ } } ] -} \ No newline at end of file +} diff --git a/src/oemof/tabular/examples/datapackages/investment_multi_period/datapackage.json b/src/oemof/tabular/examples/datapackages/investment_multi_period/datapackage.json index ba6ea7ce..3f5ce560 100644 --- 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 @@ } } ] -} \ No newline at end of file +} From c941f024aab2d9441b8117b493c9e1096c30f4b4 Mon Sep 17 00:00:00 2001 From: "Julian.Endres" Date: Fri, 23 Feb 2024 18:22:02 +0100 Subject: [PATCH 2/4] Add missing changelog entries --- CHANGELOG.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2cf9edbd..51c93857 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -18,7 +18,9 @@ Fixes * Remove specific dirs from flake8 & isort `#136 `_ * Update lp-files to pyomo6.7 `#148 `_ -* Fix oemof.solph version to v0.5.2dev1 `#159 `_ +* Rework periodic value deserialization `#154 `_ +* Fix oemof.solph version to v0.5.2dev1 `#157 `_ +* Fix oemof.solph version to v0.5.2.dev1 `#159 `_ From 0c15f19a713dabc2ff915ca019dac4c1a9db8da4 Mon Sep 17 00:00:00 2001 From: "Julian.Endres" Date: Fri, 23 Feb 2024 18:25:44 +0100 Subject: [PATCH 3/4] Update authors --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3713f52c..bac071ba 100644 --- a/setup.py +++ b/setup.py @@ -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="gnn.code@gmail.com", url="https://github.com/oemof/oemof-tabular", packages=["oemof"] + ["oemof." + p for p in find_packages("src/oemof")], From f2bf60c876ca7e5895896d73306f7ca5b34f1c93 Mon Sep 17 00:00:00 2001 From: "Julian.Endres" Date: Fri, 23 Feb 2024 18:28:12 +0100 Subject: [PATCH 4/4] Finish changelog v0.0.5 --- CHANGELOG.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 51c93857..fb6f999c 100644 --- 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