Merge branch 'master' into dev

oemof · Sep 12, 2023 · d72fb8a · d72fb8a
2 parents 125d696 + c00ad89
commit d72fb8a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,11 @@ Changelog
 
 Unreleased
 ------------------
+
+
+0.0.4 Patch Release (2023-08-31)
+-----------------------------------------------------
+
 Features
 
 * Add PR template `#129 <https://github.com/oemof/oemof-tabular/pull/129>`_

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def read(*names, **kwargs):
 
 setup(
     name="oemof.tabular",
-    version="0.0.4dev1",
+    version="0.0.4",
     license="BSD 3-Clause License",
     description="Load oemof energy systems from tabular data sources.",
     long_description="%s\n%s"
@@ -67,7 +67,7 @@ def read(*names, **kwargs):
     install_requires=[
         "datapackage==1.5.1",
         "tableschema==1.7.4",  # newer versions (v1.8.0 and up) fail!
-        "oemof.solph==0.5.1rc1",
+        "oemof.solph==0.5.1",
         "pandas>=0.22",
         "paramiko",
         "toml",

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

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.4dev",
+    "oemof_tabular_version": "0.0.4",
     "resources": [
         {
             "path": "data/elements/bus.csv",

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.4dev",
+    "oemof_tabular_version": "0.0.4",
     "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.4dev",
+    "oemof_tabular_version": "0.0.4",
     "resources": [
         {
             "path": "data/elements/bus.csv",

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.4dev",
+    "oemof_tabular_version": "0.0.4",
     "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.4dev",
+    "oemof_tabular_version": "0.0.4",
     "resources": [
         {
             "path": "data/elements/bus.csv",

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.4dev",
+    "oemof_tabular_version": "0.0.4",
     "resources": [
         {
             "path": "data/elements/bus.csv",