removed duplicate job definition for network_schema (#3015)

* removed duplicate job definition for network_schema

* fixed import

* fixed typing using non lazy class

* fixed mypy issue

* updated astral-sh/setup-uv action
(Node 20 deprecation)

Author: KS-HTK

.github/workflows/github_test_action.yml

@@ -36,7 +36,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Install uv
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -71,7 +71,7 @@ jobs:
   network_schema:
     # This tests only the network_schema tests due to the large amount these are only tested on min/max python version
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     strategy:
       matrix:
         #python-version: ['3.10', '3.14']
@@ -82,20 +82,20 @@ jobs:
 #      - uses: julia-actions/setup-julia # Update version when using this by adding commit sha!
       - uses: actions/checkout@v6
       - name: Install uv
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           #python-version: ${{ matrix.python-version }}
           python-version: '3.14'
       - name: Install dependencies
         run: |
-          uv sync --extra dev          
-          uv pip install pytest-split
+          uv sync --extra dev
+          uv pip uninstall juliacall
+          uv pip install pytest-cov pytest-split
       - name: List of installed packages
         run: |
           uv pip list
       - name: Test with pytest, Codecov and Coverage
         run: |
-          uv pip install pytest-cov numpy~=1.26
           uv run pytest --cov=./ --cov-report=xml --splits 4 --group ${{ matrix.group }} pandapower/test/network_schema
           cp ./coverage.xml ./coverage-net-schema-${{ matrix.group }}.xml
       - name: Upload coverage as artifact
@@ -113,7 +113,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Install uv
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           python-version: "3.14"
       - name: Install dependencies
@@ -168,38 +168,6 @@ jobs:
           name: coverage-opf
           path: ./coverage-opf.xml
 
-  network_schema:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    strategy:
-      matrix:
-        group: [1, 2, 3, 4]
-    steps:
-      - uses: actions/checkout@v6
-      - name: Install uv
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
-        with:
-          python-version: '3.14'
-          # Reminder: when removing the support of an old python version here, then don't forget to
-          # remove it also in pyproject.toml 'requires-python' and the release pipelines
-      - name: Install dependencies
-        run: |
-          uv sync --extra dev
-          uv pip uninstall juliacall
-          uv pip install pytest-cov pytest-split
-      - name: List of installed packages
-        run: |
-          uv pip list
-      - name: Test with pytest, Codecov and Coverage
-        run: |
-          uv run pytest --cov=./ --cov-report=xml --splits 4 --group ${{ matrix.group }} pandapower/test/network_schema
-          cp ./coverage.xml ./coverage-${{ matrix.group }}-network_schema.xml
-      - name: Upload coverage as artifact
-        uses: actions/upload-artifact@v7
-        with:
-          name: coverage-${{ matrix.group }}-network_schema
-          path: ./coverage-${{ matrix.group }}-network_schema.xml
-
   upload-coverage:
     runs-on: ubuntu-latest
     needs: [build, opf, network_schema]
@@ -249,7 +217,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
     - name: Install uv
-      uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+      uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -273,7 +241,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
     - name: Install uv
-      uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+      uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -310,7 +278,7 @@ jobs:
     steps:
     - uses: actions/checkout@v6
     - name: Install uv
-      uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+      uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -373,7 +341,7 @@ jobs:
         fi
     - uses: actions/checkout@v6
     - name: Install uv
-      uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+      uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -460,7 +428,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Install uv
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

.github/workflows/test_release.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Install uv
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           python-version: ${{ matrix.python-version }}
 

pandapower/results.py

@@ -4,14 +4,13 @@
 import numpy as np
 import pandas as pd
 
-from network_structure import get_results_structure_dict
 from pandapower.auxiliary import get_vsc_stacked_names, pandapowerNet
 from pandapower.results_branch import _get_branch_results, _get_branch_results_3ph
 from pandapower.results_bus import _get_bus_results, _get_bus_dc_results, _set_buses_out_of_service, \
     _get_shunt_results, _get_p_q_results, _get_bus_v_results, _get_bus_v_results_3ph, _get_p_q_results_3ph, \
     _get_bus_results_3ph, _get_bus_dc_v_results, _get_p_dc_results, _set_dc_buses_out_of_service
 from pandapower.results_gen import _get_gen_results, _get_gen_results_3ph, _get_dc_slack_results
-from pandapower.network_structure import get_structure_dict
+from pandapower.network_structure import get_results_structure_dict
 
 BRANCH_RESULTS_KEYS = ("branch_ikss_f", "branch_ikss_t",
                        "branch_ikss_angle_f", "branch_ikss_angle_t",
@@ -41,7 +40,7 @@ class EmptyResults(metaclass=_EmptyResultsMeta):
 
     Will be created on first call, all subsequent calls will be faster
     """
-    _instance: EmptyResults = None
+    _instance: "EmptyResults | None" = None
     _data: dict[str, pd.DataFrame] = {}
 
     def __new__(cls):