Merge branch 'dev' into patch-1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -25,7 +25,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. iOS, Debian, Ubuntu, Windows10]
- - Python version [e.g. 3.8]
+ - Python version [e.g. 3.11]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/lint.yml

@@ -15,18 +15,18 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.11
 
       - name: Install Python dependencies
         run: pip install black flake8
 
       - name: Run linters
-        uses: samuelmeuli/lint-action@v1
+        uses: wearerequired/lint-action@v2
         with:
           github_token: ${{ secrets.github_token }}
           # Enable linters

.github/workflows/packaging.yml

@@ -16,22 +16,23 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9]
+        python-version: [3.11]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - 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
+        python -m pip install -e .[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

@@ -28,25 +28,24 @@ jobs:
       - 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.11' }}
+        uses: actions/setup-python@v5
         with:
-          python-version: "${{ env.default_python || '3.9' }}"
+          python-version: "${{ env.default_python || '3.11' }}"
 
       - 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') }}
+          key: ${{ runner.os }}-pip-${{ matrix.toxenv }}-${{ hashFiles('tox.ini', 'pyproject.toml') }}
           restore-keys: |
             ${{ runner.os }}-pip-${{ matrix.toxenv }}-
             ${{ runner.os }}-pip-
 
       - name: Install dependencies
         run: |
-          python -m pip install -U pip
-          python -m pip install -U setuptools wheel
-          python -m pip install -U tox
+          python -m pip install pip --upgrade
+          python -m pip install tox
 
       - name: Run ${{ matrix.toxenv }}
         run: python -m tox -e ${{ matrix.toxenv }}

.github/workflows/tox_pytests.yml

@@ -12,24 +12,22 @@ on:
     - 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.9", "3.10", "3.11"]
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Install xmllint
-      run: sudo apt install coinor-cbc
+    - uses: actions/checkout@v4
     - 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
-        pip install tox tox-gh-actions coverage coveralls
+        python -m pip install tox tox-gh-actions coverage coveralls
     - name: Test with tox
       run: tox
 

.gitignore

@@ -63,12 +63,14 @@ docs/_build
 .build
 .ve
 .env
+.venv/
 .cache
 .pytest
 .benchmarks
 .bootstrap
 .appveyor.token
 *.bak
+venv/
 
 # Mypy Cache
 .mypy_cache/

.readthedocs.yml

@@ -1,5 +1,9 @@
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 version: 2
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.8"
 sphinx:
   configuration: docs/conf.py
 formats: all

AUTHORS.rst

@@ -4,13 +4,16 @@ Authors
 
 (alphabetic order)
 
- * Birgit Schachler
- * Caroline Möller
- * Guido Plessmann
- * Hendrik Huyskens
- * Jann Launer
- * Patrik Schönfeldt
- * Pyosch
- * Steffen Wehkamp
- * Stephen Bosch
- * Uwe Krien
+* Amedeo Ceruti
+* Birgit Schachler
+* Caroline Möller
+* Florian Maurer
+* Francesco Witte
+* Guido Plessmann
+* Hendrik Huyskens
+* Jann Launer
+* Patrik Schönfeldt
+* Pyosch
+* Steffen Wehkamp
+* Stephen Bosch
+* Uwe Krien

CHANGELOG.rst

@@ -1,20 +1,32 @@
 Changelog
 =========
 
-v0.1.10 (?-?-?)
+v0.2.1 (yyyy-mm-dd)
 +++++++++++++++++++++++++
 
 New features
 ############
-*
 
 Bug fixes
 #########
-*   
+
+Other changes
+#############
+
+
+
+v0.2.0 (2024-06-27)
++++++++++++++++++++++++++
+
+Bug fixes
+#########
+*   Raise error for non supported shlp_type 
+	in non-commercial buildings
 
 Other changes
 #############
 *   Adhere to packaging standards
+* 	Raise errors in sigmoid parameter queries
 
 
 v0.1.9 (2023-03-18)

README.rst

@@ -15,7 +15,7 @@ Overview
       - | |version| |wheel| |supported-versions| |supported-implementations| |commits-since| |packaging|
 
 
-.. |tox-pytest| image:: https://github.com/oemof/demandlib/workflows/tox%20pytests/badge.svg?branch=dev
+.. |tox-pytest| image:: https://github.com/oemof/demandlib/workflows/tox%20pytests/badge.svg
      :target: https://github.com/oemof/demandlib/actions?query=workflow%3A%22tox+checks%22
 
 .. |tox-checks| image:: https://github.com/oemof/demandlib/workflows/tox%20checks/badge.svg?branch=dev
@@ -48,9 +48,9 @@ Overview
     :alt: Supported implementations
     :target: https://pypi.org/project/demandlib
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/oemof/demandlib/v0.1.8.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/oemof/demandlib/latest/dev
     :alt: Commits since latest release
-    :target: https://github.com/oemof/demandlib/compare/v0.1.9...dev
+    :target: https://github.com/oemof/demandlib/compare/master...dev