Merge pull request #969 from oemof/v0.5

Release v0.5.1
oemof · Aug 31, 2023 · 6b43450 · 6b43450
2 parents 32711ad + cb9a182
commit 6b43450
Show file tree

Hide file tree

Showing 300 changed files with 55,072 additions and 7,241 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.0
+current_version = 0.5.1
 commit = True
 tag = True
 

diff --git a/.cookiecutterrc b/.cookiecutterrc
diff --git a/.github/workflows/tox_checks.yml b/.github/workflows/tox_checks.yml
@@ -25,6 +25,8 @@ jobs:
           - docs
 
     steps:
+      - name: Update package list
+        run: sudo apt update
       - name: Install LaTeX
         run: sudo apt install dvipng rubber texlive-latex-extra
       - name: Git clone

diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ htmlcov
 .project
 .pydevproject
 .idea
+.vscode
 *.iml
 *.komodoproject
 

diff --git a/.readthedocs.yml → .readthedocs.yaml b/.readthedocs.yml → .readthedocs.yaml
@@ -5,7 +5,7 @@ build:
     - coinor-cbc
 sphinx:
   configuration: docs/conf.py
-formats: all
+formats: []
 python:
   version: "3.8"
   install:

diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -28,11 +28,14 @@ Authors
 * Jonathan Amme
 * Julian Endres
 * Lluis Millet
+* Lennart Schürmann
 * Martin Soethe
+* Marie-Claire Gering
 * Patrik Schönfeldt
 * Pierre-François Duc
 * Saeed Sayadi
 * Sarah Berendes
 * Simon Hilpert
 * Stephan Günther
 * Uwe Krien
+* Tobi Rohrer
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
diff --git a/CITATION.cff b/CITATION.cff
@@ -51,6 +51,8 @@ authors:
     given-names: Hendrik
     alias: "@henhuy"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@steffenGit"
   -
     family-names: Schachler
@@ -81,10 +83,12 @@ authors:
     given-names: David
     alias: "@DFuh"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@gplssm"
   -
-    family-names: Francesco
-    given-names: Witte
+    family-names: Witte
+    given-names: Francesco
     alias: "@fwitte"
   -
     family-names: Kassing
@@ -103,39 +107,67 @@ authors:
     given-names: Bryan
     alias: "@bmlancien"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@nesnoj"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@lmilletb"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@mloenneberga"
   -
+    family-names: "Schürmann"
+    given-names: Lennart
     alias: "@lensum"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@RD-OTH"
   -
     family-names: Delfs
     given-names: Jens-Olaf
     alias: "@drjod"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@stefansc1"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@escalacjo"
   -
     family-names: Smalla
     given-names: Tjark
     alias: "@ChillkroeteTTS"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@ajimenezUCLA"
   -
     family-names: Wolf
     given-names: Jakob
     alias: "@jakob-wo"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@elisapap"
   -
     family-names: Gaudchau
     given-names: Elisa
     alias: "@elisagaudchau"
   -
+    family-names: Developer
+    given-names: Anonymous
     alias: "@chrisflei"
+  -
+    family-names: Rohrer
+    given-names: Tobi
+    alias: "@tobirohrer"
+  -
+    family-names: Gering
+    given-names: Marie-Claire
+    alias: "@MaGering"
 ...
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -72,11 +72,11 @@ For merging, you should:
 
 1. Include passing tests (run ``tox``) [1]_.
 2. Update documentation when there's new API, functionality etc.
-3. Add a note to ``CHANGELOG.rst`` about the changes.
-4. Add yourself to ``AUTHORS.rst`` and ``CITATION.cff``.
+3. Add a note about the changes to ``docs/whatsnew/next_version.rst``.
+4. Add your name to ``AUTHORS.rst`` and ``CITATION.cff``.
 
-.. [1] If you don't have all the necessary python versions available locally you can rely on Travis - it will
-       `run the tests <https://travis-ci.org/oemof/oemof-solph/pull_requests>`_ for each change you add in the pull request.
+.. [1] If you don't have all the necessary python versions available locally,
+       you can rely on the CI pipeline at GitHub.
 
        It will be slower though ...
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014-2022, oemof developer group
+Copyright (c) 2014-2023, oemof developer group
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -9,17 +9,16 @@ include .cookiecutterrc
 include .editorconfig
 
 include AUTHORS.rst
-include CHANGELOG.rst
 include CITATION.cff
 include CONTRIBUTING.rst
 include LICENSE
 include README.rst
 include *.md
 include VERSION
-include pytest.ini
 
 include tox.ini
 include *.yml
+include *.yaml
 
 recursive-exclude examples *.py
 recursive-include examples *.csv