Merge pull request #161 from oemof/release-v0.0.5

Patch Release v0.0.5 Miraculous Mary

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.8', '3.9', '3.10' ]
+        python-version: ["3.9", "3.10"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

.pre-commit-config.yaml

@@ -9,23 +9,14 @@ repos:
       - id: trailing-whitespace
         files: (^|/)a/.+\.(py|html|sh|css|js)$
 
--   repo: local
-    hooks:
-      - id: flake8
-        name: flake8
-        entry: flake8
-        language: python
-        types: [python]
-        args: ["src", "tests"]
-
 -   repo: local
     hooks:
       - id: isort
         name: isort
         entry: isort
         language: python
         types: [python]
-        args: ["--verbose", "src", "tests"]
+#        args: ["--verbose", "src", "tests"]
 
 -   repo: local
     hooks:
@@ -34,3 +25,12 @@ repos:
         entry: black
         language: python
         types: [python]
+
+-   repo: local
+    hooks:
+      - id: flake8
+        name: flake8
+        entry: flake8
+        language: python
+        types: [python]
+#        args: ["src", "tests"]

AUTHORS.rst

@@ -13,3 +13,4 @@ Authors
 * Sarah Berendes
 * Marie-Claire Gering
 * Julian Endres
+* Felix Maurer

CHANGELOG.rst

@@ -5,7 +5,30 @@ Changelog
 
 
 Unreleased
-------------------
+----------
+
+Features
+
+Fixes
+
+
+0.0.5 Patch Release - Miraculous Mary (2024-02-23)
+-----------------------------------------------------
+
+Features
+
+* Improve reading error message `#134 <https://github.com/oemof/oemof-tabular/pull/134>`_
+* Remove facade relicts `#135 <https://github.com/oemof/oemof-tabular/pull/135>`_
+* Add dev install version `#147 <https://github.com/oemof/oemof-tabular/pull/147>`_
+
+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>`_
+* 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>`_
+
 
 
 0.0.4 Patch Release (2023-08-31)

docs/code/get_facade_attributes.py

@@ -3,8 +3,6 @@
 
 import pandas as pd
 
-from oemof.tabular.facades import TYPEMAP
-
 
 def get_facade_attrs(TYPEMAP):
     facade_attrs = {}

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 = ['.']

punch_version.py

@@ -1,4 +1,4 @@
 major = 0
 minor = 0
 patch = 5
-status = "dev"
+status = ""

setup.py

@@ -20,7 +20,7 @@ def read(*names, **kwargs):
 
 setup(
     name="oemof.tabular",
-    version="0.0.4",
+    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="gnn.code@gmail.com",
     url="https://github.com/oemof/oemof-tabular",
     packages=["oemof"] + ["oemof." + p for p in find_packages("src/oemof")],
@@ -51,7 +51,6 @@ def read(*names, **kwargs):
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
@@ -64,16 +63,22 @@ def read(*names, **kwargs):
     keywords=[
         # eg: 'keyword1', 'keyword2', 'keyword3',
     ],
+    python_requires=">=3.9, <3.11",
     install_requires=[
         "datapackage==1.5.1",
         "tableschema==1.7.4",  # newer versions (v1.8.0 and up) fail!
-        "oemof.solph==0.5.1",
+        # "oemof.solph>=0.5.1",
+        # Upcomming upgrade to solph 0.5.2 postponed due to many changes necessary for implementing
+        # explicit arguments and upgrade to network 0.5.1
+        "oemof.solph==0.5.2.dev1",
         "pandas>=0.22",
+        "oemof.network==0.5.0a4",  # Temporal fix due to braking changes in 0.5.1
         "paramiko",
         "toml",
     ],
     extras_require={
         "cli": ["click"],
+        "dev": ["pytest", "black", "isort", "flake8"],
         "plots": ["plotly", "matplotlib"],
         "aggregation": ["tsam"],
         "geometry": ["shapely", "scipy", "pyproj", "geojson", "pyshp"],

src/oemof/tabular/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.4"
+__version__ = "0.0.5"
 __project__ = "oemof.tabular"
 
 

src/oemof/tabular/__main__.py

@@ -8,6 +8,7 @@
 - https://docs.python.org/2/using/cmdline.html#cmdoption-m
 - https://docs.python.org/3/using/cmdline.html#cmdoption-m
 """
+
 from tabular.cli import main
 
 if __name__ == "__main__":

src/oemof/tabular/cli.py

@@ -2,6 +2,7 @@
 Module that contains the command line app.
 
 """
+
 import collections
 import copy
 

src/oemof/tabular/config/config.py

@@ -23,5 +23,6 @@
     "0.0.1",
     "0.0.2",
     "0.0.3",
-    "0.0.4dev",
+    "0.0.4",
+    "0.0.5",
 ]

src/oemof/tabular/datapackage/aggregation.py

@@ -88,9 +88,9 @@ def temporal_skip(datapackage, n, path="/tmp", name=None, *args):
     r = Resource({"path": "data/temporal.csv"})
     r.infer()
 
-    r.descriptor[
-        "description"
-    ] = "Temporal selection based on skipped timesteps. Skipped n={}".format(n)
+    r.descriptor["description"] = (
+        "Temporal selection based on skipped timesteps. Skipped n={}".format(n)
+    )
 
     # Update meta-data of copied package
     cp = Package("datapackage.json")
@@ -212,9 +212,9 @@ def temporal_clustering(datapackage, n, path="/tmp", how="daily"):
     r = Resource({"path": "data/temporal.csv"})
     r.infer()
     # TODO: Add meta-data description
-    r.descriptor[
-        "description"
-    ] = "Temporal selection based on hierachical clustering..."
+    r.descriptor["description"] = (
+        "Temporal selection based on hierachical clustering..."
+    )
 
     # Update meta-data of copied package
     cp = Package("datapackage.json")