Merge branch 'develop' into fix/pandas_futurewarnings

e2nIEE · Dec 11, 2024 · bebdecd · bebdecd
2 parents 50b2495 + dc44c21
commit bebdecd
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 100 deletions.
diff --git a/.github/workflows/github_test_action.yml b/.github/workflows/github_test_action.yml
@@ -25,31 +25,31 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       #- uses: julia-actions/setup-julia@v1.5
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install pytest pytest-split
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-          python -m pip install .["all"]
-          if ${{ matrix.python-version == '3.9' }}; then python -m pip install pypower; fi
-          if ${{ matrix.python-version != '3.9' }}; then python -m pip install numba; fi
-          if ${{ matrix.python-version == '3.10' }}; then python -m pip install lightsim2grid; fi
+          uv sync --all-extras          
+          if [ -f requirements.txt ]; then uv pip install -r requirements.txt; fi
+          uv pip install pytest-split
+          if ${{ matrix.python-version == '3.9' }}; then uv pip install pypower; fi
+          if ${{ matrix.python-version != '3.9' }}; then uv pip install numba; fi
+          if ${{ matrix.python-version == '3.10' }}; then uv pip install lightsim2grid; fi
       - name: List of installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
         if: ${{ matrix.python-version != '3.9' }}
         run: |
-          python -m pytest --splits 2 --group ${{ matrix.group }}
+          uv run pytest --splits 2 --group ${{ matrix.group }}
       - name: Test with pytest, Codecov and Coverage
         if: ${{ matrix.python-version == '3.9' }}
         run: |
-          python -m pip install pytest-cov
-          python -m pytest -n=auto --cov=./ --cov-report=xml --splits 2 --group ${{ matrix.group }}
+          uv pip install pytest-cov
+          uv run pytest -n=auto --cov=./ --cov-report=xml --splits 2 --group ${{ matrix.group }}
           cp ./coverage.xml ./coverage-${{ matrix.group }}.xml
       - name: Upload coverage as artifact
         if: ${{ matrix.python-version == '3.9' }}
@@ -71,29 +71,27 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       #- uses: julia-actions/setup-julia@v1.5
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install pytest pytest-split
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-          python -m pip install .["all"]
-          python -m pip install pypower
+          uv sync --all-extras
+          uv pip install pypower pytest-split
+          if [ -f requirements.txt ]; then uv pip install -r requirements.txt; fi
       - name: Install Julia
         run: |
           ./.install_julia.sh 1.10.4
-          python -m pip install julia
-          python ./.install_pycall.py
+          uv pip install julia
+          uv run python ./.install_pycall.py
       - name: List of installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest, Codecov and Coverage
         run: |
-          python -m pip install pytest-cov
-          python -m pytest -n=auto --cov=./ --cov-report=xml --splits 2 --group ${{ matrix.group }}
+          uv pip install pytest-cov
+          uv run pytest -n=auto --cov=./ --cov-report=xml --splits 2 --group ${{ matrix.group }}
           cp ./coverage.xml ./coverage-${{ matrix.group }}.xml
 
   upload-coverage:
@@ -137,22 +135,21 @@ jobs:
         group: [ 1, 2 ]
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - name: Install uv
+      uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        python -m pip install pytest pytest-split
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        python -m pip install .["all"]
+        uv sync --all-extras
+        uv pip install pytest-split
+        if [ -f requirements.txt ]; then uv pip install -r requirements.txt; fi
     - name: List of installed packages
       run: |
-        python -m pip list
+        uv pip list
     - name: Test with pytest
       run: |
-        python -m pytest -W error --splits 2 --group ${{ matrix.group }}
+        uv run pytest -W error --splits 2 --group ${{ matrix.group }}
 
   relying: # packages that rely on pandapower
     runs-on: ubuntu-latest
@@ -161,31 +158,30 @@ jobs:
         python-version: ['3.9', '3.10', '3.11', '3.12']
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - name: Install uv
+      uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        python -m pip install pytest setuptools
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        python -m pip install .
-        python -m pip install matplotlib
-        if ${{ matrix.python-version != '3.9' }}; then python -m pip install numba; fi
+        uv sync --extra test
+        uv pip install setuptools
+        if [ -f requirements.txt ]; then uv pip install -r requirements.txt; fi        
+        uv pip install matplotlib
+        if ${{ matrix.python-version != '3.9' }}; then uv pip install numba; fi
     - name: Install pandapipes and simbench
       run: |
-        python -m pip install git+https://github.com/e2nIEE/pandapipes@develop#egg=pandapipes
-        python -m pip install git+https://github.com/e2nIEE/simbench@develop#egg=simbench
+        uv pip install git+https://github.com/e2nIEE/pandapipes@develop#egg=pandapipes
+        uv pip install git+https://github.com/e2nIEE/simbench@develop#egg=simbench
     - name: List of installed packages
       run: |
-        python -m pip list
+        uv pip list
     - name: Test pandapipes
       run: |
-        python -c 'from pandapipes import pp_dir; import pytest; import sys; ec = pytest.main([pp_dir]); sys.exit(ec)'
+        uv run python -c 'from pandapipes import pp_dir; import pytest; import sys; ec = pytest.main([pp_dir]); sys.exit(ec)'
     - name: Test simbench
       run: |
-        python -c 'from simbench import sb_dir; import pytest; import sys; ec = pytest.main([sb_dir]); sys.exit(ec)'
+        uv run python -c 'from simbench import sb_dir; import pytest; import sys; ec = pytest.main([sb_dir]); sys.exit(ec)'
 
   linting:
     # run flake8 and check for errors
@@ -197,28 +193,26 @@ jobs:
         python-version: ['3.10']
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - name: Install uv
+      uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        python -m pip install flake8
-        python -m pip install .
-        python -m pip install matplotlib
+        uv sync
+        uv pip install flake8 matplotlib
     - name: List of installed packages
       run: |
-        python -m pip list
+        uv pip list
     - name: Lint with flake8 (sytax errors and undefined names)
       continue-on-error: true
       run: |
         # stop the build if there are Python syntax errors or undefined names (omitted by exit-zero)
-        flake8 . --count --exit-zero --select=E9,F63,F7,F82 --show-source --statistics
+        uv run flake8 . --exclude .venv --count --exit-zero --select=E9,F63,F7,F82 --show-source --statistics
     - name: Lint with flake8 (all errors and warnings)
       run: |
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        uv run flake8 . --exclude .venv --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
   postgresql:
     # for the one test to cover postgresql
@@ -228,17 +222,16 @@ jobs:
         python-version: ['3.12']
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - name: Install uv
+      uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        python -m pip install .[test,fileio]
+        uv sync --extra test --extra fileio
     - name: List of installed packages
       run: |
-        python -m pip list
+        uv pip list
     - name: Create PostgreSQL database
       run: |
         sudo systemctl start postgresql.service
@@ -249,73 +242,61 @@ jobs:
         PGPASSWORD=secret psql --username=test_user --host=localhost --list sandbox
     - name: Test pandapower File I/O
       run: |
-        python -c "import os; import json; from pandapower import pp_dir; conn_data={'host': 'localhost', 'user': 'test_user', 'database': 'sandbox', 'password': 'secret', 'schema': 'test_schema'}; fp = open(os.path.join(pp_dir, 'test', 'test_files', 'postgresql_connect_data.json'), 'w'); json.dump(conn_data, fp); fp.close()"
-        python -c 'from pandapower import pp_dir; import pytest; import sys; import os; ec = pytest.main([os.path.join(pp_dir,"test","api","test_sql_io.py")]); sys.exit(ec)'
+        uv run python -c "import os; import json; from pandapower import pp_dir; conn_data={'host': 'localhost', 'user': 'test_user', 'database': 'sandbox', 'password': 'secret', 'schema': 'test_schema'}; fp = open(os.path.join(pp_dir, 'test', 'test_files', 'postgresql_connect_data.json'), 'w'); json.dump(conn_data, fp); fp.close()"
+        uv run python -c 'from pandapower import pp_dir; import pytest; import sys; import os; ec = pytest.main([os.path.join(pp_dir,"test","api","test_sql_io.py")]); sys.exit(ec)'
 
   tutorial_tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: '3.11'
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install pytest nbmake pytest-xdist igraph numba seaborn
+          uv sync --all-extras
+          uv pip install seaborn
           ./.install_julia.sh 1.10.4
-          python -m pip install julia
-          python ./.install_pycall.py
-          python -m pip install jupyter
-          python -m pip install .["all"]
+          uv pip install julia seaborn jupyter
+          uv run python ./.install_pycall.py
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
         # Careful when copying this command. The PYTHONPATH setup is Linux specific syntax.
         run: |
-          python -m pytest --nbmake -n=auto --nbmake-timeout=900 "./tutorials"
+          uv run pytest --nbmake -n=auto --nbmake-timeout=900 "./tutorials"
 
   tutorial_warnings_tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: '3.11'
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install .[all]
-          python -m pip install pytest nbmake pytest-xdist igraph numba seaborn
+          uv sync --all-extras          
           ./.install_julia.sh 1.10.4
-          python -m pip install julia
-          python ./.install_pycall.py
+          uv pip install julia seaborn
+          uv run python ./.install_pycall.py
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
         run: |
-          python -m pytest -W error --nbmake -n=auto --nbmake-timeout=900 "./tutorials"
+          uv run pytest -W error --nbmake -n=auto --nbmake-timeout=900 "./tutorials"
 
   docs_check:
+    name: Sphinx docs check
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [ '3.9' ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Check docs for Python ${{ matrix.python-version }}
-        uses: e2nIEE/sphinx-action@master
+      - name: Check sphinx build
+        uses: ammaraskar/sphinx-action@7.4.7
         with:
-          pre-build-command: "apt update && apt upgrade -y && apt install -y build-essential gfortran cmake pkg-config libopenblas-dev;
-            python -m pip install --upgrade pip;
-            python -m pip install .[docs];"
+          pre-build-command: "python -m pip install uv && uv pip install .[docs] --system --link-mode=copy"
           build-command: "sphinx-build -b html . _build -W"
           docs-folder: "doc/"
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,7 @@ Change Log
 - [ADDED] Add GeographicalRegion and SubGeographicalRegion names and ids to bus df in cim converter
 - [CHANGED] Capitalize first letter of columns busbar_id, busbar_name and substation_id in bus df for cim converter
 - [FIXED] Do not modify pandas options when importing pandapower
+- [FIXED] fixed copy-paste error in contingency results "max_limit_nminus1" and "min_limit_nminus1"
 - [ADDED] improved lightsim2grid documentation including compatibitliy issues
 - [FIXED] cim2pp: set default xml encoding to None to avoid error after changing to lxml
 

diff --git a/doc/requirements.txt b/doc/requirements.txt
diff --git a/pandapower/contingency/contingency.py b/pandapower/contingency/contingency.py
@@ -367,11 +367,11 @@ def get_element_limits(net):
                 "max_limit": net.bus.loc[bus_index, "max_vm_pu"].values,
                 "min_limit": net.bus.loc[bus_index, "min_vm_pu"].values,
                 "max_limit_nminus1":
-                    net.line.loc[bus_index, "max_vm_nminus1_pu"].values
+                    net.bus.loc[bus_index, "max_vm_nminus1_pu"].values
                     if "max_vm_nminus1_pu" in net.bus.columns
                     else net.bus.loc[bus_index, "max_vm_pu"].values,
                 "min_limit_nminus1":
-                    net.line.loc[bus_index, "min_vm_nminus1_pu"].values
+                    net.bus.loc[bus_index, "min_vm_nminus1_pu"].values
                     if "min_vm_nminus1_pu" in net.bus.columns
                     else net.bus.loc[bus_index, "min_vm_pu"].values}})
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -59,7 +59,7 @@ Download = "https://pypi.org/project/pandapower/#files"
 Changelog = "https://github.com/e2nIEE/pandapower/blob/develop/CHANGELOG.rst"
 
 [project.optional-dependencies]
-docs = ["numpydoc", "matplotlib", "sphinx", "sphinx_rtd_theme", "sphinx-pyproject"]
+docs = ["numpydoc>=1.5.0", "matplotlib", "sphinx>=5.3.0", "sphinx_rtd_theme>=1.1.1", "sphinx-pyproject"]
 plotting = ["plotly>=3.1.1", "matplotlib", "igraph", "geopandas>=1.0"]
 test = ["pytest~=8.1", "pytest-xdist", "nbmake"]
 performance = ["ortools", "numba>=0.25", "lightsim2grid==0.9.0"]
@@ -68,7 +68,7 @@ converter = ["matpowercaseframes"]
 pgm = ["power-grid-model-io"]
 control = ["shapely"]
 all = [
-    "numpydoc", "sphinx", "sphinx_rtd_theme", "sphinx-pyproject",
+    "numpydoc>=1.5.0", "sphinx>=5.3.0", "sphinx_rtd_theme>=1.1.1", "sphinx-pyproject",
     "plotly>=3.1.1", "matplotlib", "igraph", "geopandas>=1.0",
     "pytest~=8.1", "pytest-xdist", "nbmake",
     "ortools", "numba>=0.25", "lightsim2grid>=0.9",