Merge branch 'dev' into features/optimiser_hints

# Conflicts:
#	src/oemof/solph/_models.py
#	src/oemof/solph/flows/_flow.py
#	src/oemof/solph/flows/_investment_flow.py
#	tests/test_processing.py

.coveragerc

@@ -8,6 +8,7 @@ source =
     tests
 parallel = true
 omit = */experimental/*
+       *test*
 
 [report]
 show_missing = true

.flake8

@@ -0,0 +1,4 @@
+[flake8]
+max-line-length = 79
+exclude = */migrations/*, docs/conf.py
+ignore = E203, W503

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,10 +12,10 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+1.  Go to '...'
+2.  Click on '....'
+3.  Scroll down to '....'
+4.  See error
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -24,8 +24,8 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS, Debian, Ubunut, Windows10]
- - Python version [e.g. 3.8]
+ -   OS: (e.g. iOS, Debian, Ubunut, Windows10)
+ -   Python version (e.g. 3.11)
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/general-issue.md

@@ -6,5 +6,3 @@ labels: ''
 assignees: ''
 
 ---
-
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,13 +1,9 @@
-* Describe your pull request as transparent as possible
-  * What functionality does it implement?
-  * Where is it located?
-  * How does the API look?
-  ...
-
-* Related issues?
-
-* Share your knowledge: Insights/Remarks
-
-* Other comments and questions
-
-* [] For new features: Remember the documentation!
+*   Describe your pull request as transparent as possible
+    *   What functionality does it implement?
+    *   Where is it located?
+    *   How does the API look?
+    *   ...
+*   Related issues?
+*   Share your knowledge: Insights/Remarks
+*   Other comments and questions
+*   For new features: Remember the documentation!

.github/workflows/codeql.yml

@@ -0,0 +1,44 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+      - 'release/**'
+  pull_request:
+    branches: [ "dev" ]
+  schedule:
+    - cron: "23 2 * * 2"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ python ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

.github/workflows/lint.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - master
       - dev
-      - v0.5
+      - 'release/**'
   pull_request:
 
 jobs:
@@ -18,9 +18,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Install Python dependencies
         run: pip install black flake8

.github/workflows/packaging.yml

@@ -3,7 +3,10 @@ name: packaging
 on:
   # Make sure packaging process is not broken
   push:
-    branches: [master, dev, v0.5]
+    branches:
+      - master
+      - dev
+      - 'release/**'
   pull_request:
   # Make a package for release
   release:
@@ -16,22 +19,22 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9]
+        python-version: ["3.10"]
 
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip setuptools setuptools_scm twine wheel
+        python -m pip install --upgrade pip setuptools setuptools_scm twine wheel build
     - name: Create packages
-      run: python setup.py sdist bdist_wheel
+      run: python -m build .
     - name: Run twine check
       run: twine check dist/*
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: tox-gh-actions-dist
         path: dist

.github/workflows/tox_checks.yml

@@ -6,7 +6,7 @@ on:
     branches:
       - master
       - dev
-      - v0.5
+      - 'release/**'
   pull_request:
 
   workflow_dispatch:
@@ -26,16 +26,20 @@ 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
         uses: actions/checkout@v2
 
-      - name: Set up Python ${{ env.default_python || '3.9' }}
-        uses: actions/setup-python@v2
+      - name: Set up Python ${{ env.default_python || '3.10' }}
+        uses: actions/setup-python@v5
         with:
-          python-version: "${{ env.default_python || '3.9' }}"
+          python-version: "${{ env.default_python || '3.10' }}"
 
       - name: Pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('tox.ini', 'setup.py') }}
@@ -46,7 +50,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U pip
-          python -m pip install -U setuptools wheel
+          python -m pip install -U setuptools wheel build
           python -m pip install -U tox
 
       - name: Run ${{ matrix.toxenv }}

.github/workflows/tox_pytests.yml

@@ -5,26 +5,26 @@ on:
     branches:
       - master
       - dev
-      - v0.5
+      - 'release/**'
   pull_request:
 
   workflow_dispatch:
   schedule:
     - cron: "0 5 * * 6"  # 5:00 UTC every Saturday
 
 jobs:
-  build:
+  pytest:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v1
-    - name: Install xmllint
+    - name: Install cbc
       run: sudo apt install coinor-cbc
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -35,7 +35,7 @@ jobs:
       run: tox
 
     - name: Check test coverage
-      run: coverage report -m --fail-under=${{ matrix.vcs == 'bzr' && 89 || 90 }}
+      run: coverage report -m --fail-under=${{ matrix.vcs == 'bzr' && 84 || 85 }}
 
     - name: Report to coveralls
       run: coveralls

.gitignore

@@ -20,8 +20,9 @@ develop-eggs
 .installed.cfg
 lib
 lib64
-venv*/
-pyvenv*/
+venv/
+.venv/
+pyvenv/
 pip-wheel-metadata/
 
 # Installer logs
@@ -44,6 +45,7 @@ htmlcov
 .project
 .pydevproject
 .idea
+.vscode
 *.iml
 *.komodoproject