Merge remote-tracking branch 'e2nIEE_pandapipes/develop' into feature…

…/plotly

.coveragerc

@@ -13,3 +13,4 @@ exclude_lines =
 omit =
     pandapipes/test/*
     pandapipes/plotting/geo.py
+    pandapipes/converter/stanet/data_cleaning.py

.github/workflows/release.yml

@@ -0,0 +1,103 @@
+# This workflow will create a Python package and upload it to testPyPi or PyPi
+# Then, it installs pandapipes from there and all dependencies and runs tests with different Python versions
+
+name: release
+
+# Controls when the action will run.
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+    inputs:
+      upload_server:
+        description: 'upload server'
+        required: true
+        default: 'testpypi'
+        type: choice
+        options:
+          - 'testpypi'
+          - 'pypi'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  upload:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
+
+      # Sets up python3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      # Installs and upgrades pip, installs twine and other packages for the release-process
+      - name: Install dependencies
+        run: |
+          # Upgrade pip
+          python3 -m pip install --upgrade pip
+          # Install twine
+          python3 -m pip install setuptools wheel twine
+
+      # Upload to TestPyPI
+      - name: Build and Upload to TestPyPI
+        if: ${{ inputs.upload_server == 'testpypi'}}
+        run: |
+          python3 setup.py sdist --formats=zip
+          twine check dist/* --strict 
+          python3 -m twine upload dist/*
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TESTPYPI }}
+          TWINE_REPOSITORY: testpypi
+
+      # Upload to PyPI
+      - name: Build and Upload to PyPI
+        if: ${{ inputs.upload_server == 'pypi' }}
+        run: |
+          python3 setup.py sdist --formats=zip
+          twine check dist/* --strict 
+          python3 -m twine upload dist/*
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI }}
+          TWINE_REPOSITORY: pypi
+
+      - name: Sleep for 300s to make release available
+        uses: juliangruber/sleep-action@v1
+        with:
+          time: 300s
+
+  build:
+
+    runs-on: ${{ matrix.os }}
+    needs: upload
+    strategy:
+      matrix:
+        python-version: ['3.8', '3.9', '3.10', '3.11']
+        os:  [ ubuntu-latest, windows-latest ]
+    steps:
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install pytest igraph pytest-split
+          if ${{ matrix.python-version != '3.11' }}; then python -m pip install numba; fi
+      - name: Install pandapipes from TestPyPI
+        if: ${{ inputs.upload_server == 'testpypi'}}
+        run: |
+          pip install --no-cache-dir -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple pandapipes
+      - name: Install pandapipes from PyPI
+        if: ${{ inputs.upload_server == 'pypi'}}
+        run: |
+          pip install pandapipes
+      - name: List all installed packages
+        run: |
+          pip list
+      - name: Test with pytest
+        run: |
+          pytest --pyargs pandapipes.test

.github/workflows/run_tests_develop.yml

@@ -18,17 +18,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pytest python-igraph pytest-split numba
+          python -m pip install pytest igraph pytest-split
+          if ${{ matrix.python-version != '3.11' }}; then python -m pip install numba; fi
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
           python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
           pip install .
@@ -55,12 +56,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8']
+        python-version: ['3.10']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -86,17 +87,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pytest nbmake pytest-xdist pytest-split python-igraph numba 
+          python -m pip install pytest nbmake pytest-xdist pytest-split igraph 
+          if ${{ matrix.python-version != '3.11' }}; then python -m pip install numba; fi
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
           python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
           pip install .
@@ -106,3 +108,25 @@ jobs:
       - name: Test with pytest
         run: |
           pytest --nbmake -n=auto "./tutorials"
+
+  docs_check:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ '3.10' ]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Check docs for Python ${{ matrix.python-version }}
+        uses: e2nIEE/sphinx-action@master
+        with:
+          pre-build-command: "apt-get update -y && apt-get install -y git;
+                              git --version;
+                              python -m pip install --upgrade pip;
+                              python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower;
+                              python -m pip install ."
+          build-command: "sphinx-build -b html source _build -W"
+          docs-folder: "doc/"

.github/workflows/run_tests_master.yml

@@ -17,20 +17,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install flake8 pytest python-igraph
+          python -m pip install pytest igraph pytest-split
+          if ${{ matrix.python-version != '3.11' }}; then python -m pip install numba; fi
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-          python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower
+          python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower;
           pip install .
       - name: List all installed packages
         run: |
@@ -54,17 +55,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pytest nbmake pytest-xdist pytest-split python-igraph numba 
+          python -m pip install pytest nbmake pytest-xdist pytest-split igraph
+          if ${{ matrix.python-version != '3.11' }}; then python -m pip install numba; fi
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
           python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower
           pip install .
@@ -74,3 +76,25 @@ jobs:
       - name: Test with pytest
         run: |
           pytest --nbmake -n=auto "./tutorials"
+
+  docs_check:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ '3.10' ]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Check docs for Python ${{ matrix.python-version }}
+        uses: e2nIEE/sphinx-action@master
+        with:
+          pre-build-command: "apt-get update -y && apt-get install -y git;
+                              git --version;
+                              python -m pip install --upgrade pip;
+                              python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower;
+                              python -m pip install ."
+          build-command: "sphinx-build -b html source _build -W"
+          docs-folder: "doc/"

.readthedocs.yml

@@ -1,9 +1,10 @@
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.9"
+
 python:
-    version: 3.7
     install:
-       - method: pip
-         path: .
-         extra_requirements:
-            - docs
+      - requirements: doc/requirements.txt

AUTHORS

@@ -1,8 +1,7 @@
-Copyright (c) 2020-2022 by Fraunhofer Institute for Energy Economics
+Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
 and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved.
 
 Lead Developers:
-    - Dennis Cronbach
     - Daniel Lohmeier
     - Simon Ruben Drauz
     - Jolando Marius Kisse
@@ -16,7 +15,14 @@ Further Contributions by:
     - Christian Spalthoff
     - Daniel Then
     - Marius Schenk
+    - Natalia Sanina
+    - Erik Prade
 
 Coordination:
     - Tanja Manuela Kneiske
+    - Lars Lauven
+    - Jan Ulffers
     - Martin Braun
+
+Alumni:
+    - Dennis Cronbach (until July 2022)