Merge pull request #2180 from OpenEnergyPlatform/release-v1.6.0

Release v1.6.0

Author: wingechr

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.5.2
+current_version = 1.6.0
 
 [bumpversion:file:VERSION]
 

.djlintrc

@@ -0,0 +1,6 @@
+{
+  "indent": 2,
+  "format_css": false,
+  "format_js": false,
+  "max_line_length": 80
+}

.eslintrc.json

@@ -120,3 +120,5 @@ site/
 
 # NPM & VITE
 patches/
+oedialect/
+oep-client/

.gitignore

@@ -1,13 +1,13 @@
-exclude: ^.*(.min.js|.min.css|.js.map|js|jsx|tsx|jsonc|scss|mkdocs.yml|/dist/.*)$
+exclude: ^.*(.min.js|.min.css|.js.map|js|mkdocs.yml|/dist/.*)$
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://github.com/psf/black
-    rev: 25.9.0
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.11.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort
@@ -21,18 +21,26 @@ repos:
       - id: flake8
         args: ["--max-line-length=88", "--ignore=E20,W503"] # black compatible
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v9.37.0
+    rev: v10.0.0-alpha.0
     hooks:
       - id: eslint
         additional_dependencies:
-          - eslint@8.14.0
+          - eslint@9.25
           - [email protected]
           - [email protected]
+          - [email protected]
+          - [email protected]
+          - [email protected]
         args: ["--fix"]
+
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
-        additional_dependencies:
-          - prettier-plugin-jinja-template
-          - prettier-plugin-sql
+        files: .*\.(json|md|yaml|yml)$
+  - repo: https://github.com/djlint/djLint
+    # see https://djlint.com/docs/integrations/
+    rev: v1.36.4
+    hooks:
+      - id: djlint-reformat-django
+        files: .*templates/.*\.html$

.pre-commit-config.yaml

@@ -1,3 +1,16 @@
 # prettier: could not determine a constructor for the tag 'tag:yaml.org,2002:python/name:material.extensions.emoji.twemoji' in "mkdocs.yml"
-
 mkdocs.yml
+
+**/*.min.js
+**/*.min.css
+
+# django templates will be handled by djlint
+*/templates/**/*.html
+
+# ignore these for now
+**/*.js
+**/*.tsx
+**/*.jsx
+**/*.css
+**/*.scss
+**/*.jsonc

.prettierignore

@@ -1,14 +1,5 @@
 {
   "proseWrap": "always",
   "printWidth": 80,
-  "trailingComma": "es5",
-  "plugins": ["prettier-plugin-jinja-template"],
-  "overrides": [
-    {
-      "files": ["**/templates/**/*.html"],
-      "options": {
-        "parser": "jinja-template"
-      }
-    }
-  ]
+  "trailingComma": "es5"
 }

.prettierrc

@@ -1,4 +1,4 @@
-cff-version: 1.5.2
+cff-version: 1.6.0
 message: "If you use this software, please cite it using these metadata."
 authors:
   - family-names: "Hülk"
@@ -28,7 +28,7 @@ authors:
 title: "Open Energy Family - Open Energy Platform (OEP)"
 type: software
 license: AGPL-3.0-or-later
-version: 1.5.2
+version: 1.6.0
 doi:
-date-released: 2025-10-30
+date-released: 2025-11-27
 url: "https://github.com/OpenEnergyPlatform/oeplatform/"

CITATION.cff

@@ -21,7 +21,7 @@ Open Energy Platform (OEP)
    * - Documentation
      - |badge_documentation| |badge_mkdocs|
    * - Tests
-     - |badge_tox|
+     - |badge_tox| |badge_precommit|
    * - Publication
      -
    * - Development
@@ -88,6 +88,10 @@ License and Citation
     :target: https://github.com/OpenEnergyPlatform/oeplatform/actions/workflows/automated-testing.yaml
     :alt: Tox Tests
 
+.. |badge_precommit| image:: https://results.pre-commit.ci/badge/github/OpenEnergyPlatform/oeplatform/develop.svg
+   :target: https://results.pre-commit.ci/latest/github/OpenEnergyPlatform/oeplatform/develop
+   :alt: pre-commit.ci status
+
 .. |badge_issue_open| image:: https://img.shields.io/github/issues-raw/OpenEnergyPlatform/oeplatform
     :target: https://github.com/OpenEnergyPlatform/oeplatform/issues
     :alt: Open Issues

README.rst

@@ -2432,7 +2432,7 @@ SPDX-FileCopyrightText = [
 ]
 
 [[annotations]]
-path = "dataedit/templates/dataedit/dataedit_schemalist.html"
+path = "dataedit/templates/dataedit/dataedit_topiclist.html"
 precedence = "override"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 SPDX-FileCopyrightText = [
@@ -2675,15 +2675,15 @@ SPDX-FileCopyrightText = [
 ]
 
 [[annotations]]
-path = "oedb_datamodels/script.py.mako"
+path = "oedb/script.py.mako"
 precedence = "override"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 SPDX-FileCopyrightText = [
   "2017 Martin Glauer <https://github.com/MGlauer> © Otto-von-Guericke-Universität Magdeburg",
 ]
 
 [[annotations]]
-path = "oedb_datamodels/README"
+path = "oedb/README"
 precedence = "override"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 SPDX-FileCopyrightText = [
@@ -3457,3 +3457,11 @@ SPDX-License-Identifier = "AGPL-3.0-or-later"
 SPDX-FileCopyrightText = [
   "2020 Christian Winger <https://github.com/wingechr> © Öko-Institut e.V.",
 ]
+
+[[annotations]]
+path = ".djlintrc"
+precedence = "override"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+SPDX-FileCopyrightText = [
+  "2020 Christian Winger <https://github.com/wingechr> © Öko-Institut e.V.",
+]