Merge branch 'feautre/restrict-numpy-2.0' into feature/vision-excel-config-update

Author: nitbharambe

.github/workflows/build-test-and-sonar.yml

@@ -77,10 +77,10 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Setup Python 3.10
+      - name: Setup Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install in develop mode
         run: |
@@ -96,7 +96,7 @@ jobs:
 
       - name: SonarCloud Scan
         if: ${{ (github.event_name == 'push') || (github.event.pull_request.head.repo.owner.login == 'PowerGridModel') }}
-        uses: SonarSource/sonarcloud-github-action@master
+        uses: SonarSource/sonarqube-scan-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -106,10 +106,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ["3.10", "3.11", "3.12"]
-        exclude:
-          - os: macos-latest
-            python: "3.10"
+        python: ["3.11", "3.12"]
       fail-fast: false
     runs-on: ${{ matrix.os }}
 
@@ -140,10 +137,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ["3.10", "3.11", "3.12"]
-        exclude:
-          - os: macos-latest
-            python: "3.10"
+        python: ["3.11", "3.12"]
       fail-fast: false
     runs-on: ${{ matrix.os }}
 
@@ -182,10 +176,10 @@ jobs:
       TWINE_PASSWORD: ${{ secrets.PYPI_PASS }}
     runs-on: ubuntu-latest
     steps:
-      - name: Setup Python 3.10
+      - name: Setup Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Load built wheel file
         uses: actions/download-artifact@v4

.github/workflows/citations.yml

@@ -31,5 +31,8 @@ jobs:
     steps:
     - name: checkout
       uses: actions/checkout@v4
+    - name: Install R
+      run: |
+        sudo apt-get update && sudo apt-get install -y r-base
     - name: Validate CITATION.cff
-      uses: dieghernan/cff-validator@v3
+      uses: dieghernan/cff-validator@v4

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 24.8.0
+    rev: 25.1.0
     hooks:
       - id: black-jupyter
   - repo: https://github.com/pre-commit/mirrors-mypy

.readthedocs.yaml

@@ -9,9 +9,9 @@ sphinx:
   configuration: docs/conf.py
 
 build:
-  os: "ubuntu-20.04"
+  os: "ubuntu-24.04"
   tools:
-    python: "3.10"
+    python: "3.12"
   jobs:
     post_install:
       # Build package with doc requirements from pyproject.optional-dependencies

CITATION.cff

@@ -14,6 +14,7 @@ authors:
     given-names: "Yu"
     email: "[email protected]"
     affiliation: "Alliander"
+    orcid: "https://orcid.org/0000-0001-5889-0067"
   - family-names: "Salemink"
     given-names: "Peter"
     email: "[email protected]"
@@ -22,10 +23,12 @@ authors:
     given-names: "Nitish"
     email: "[email protected]"
     affiliation: "Alliander"
+    orcid: "https://orcid.org/0009-0007-9694-6077"
   - family-names: "Govers"
-    given-names: "Martinus"
+    given-names: "Martinus G.H."
     email: "[email protected]"
     affiliation: "Alliander"
+    orcid: "https://orcid.org/0009-0008-6890-8353"
   - family-names: "Bogaard"
     name-particle: "van den"
     given-names: "Jonas"
@@ -37,9 +40,15 @@ authors:
     given-names: "Zhen"
     email: "[email protected]"
     affiliation: "Alliander"
+    orcid: "https://orcid.org/0000-0003-4317-6455"
   - family-names: "Guo"
-    given-names: "Jerry"
-    email: "[email protected]"
+    given-names: "Jerry Jinfeng"
+    email: "[email protected]"
+    affiliation: "Alliander"
+    orcid: "https://orcid.org/0000-0002-8065-4084"
+  - family-names: "Figueroa Manrique"
+    given-names: "Santiago"
+    email: "[email protected]"
     affiliation: "Alliander"
   - family-names: "Jagutis"
     given-names: "Laurynas"
@@ -49,14 +58,10 @@ authors:
     given-names: "Chenguang"
     email: "[email protected]"
     affiliation: "Alliander"
-  - family-names: "Figueroa Manrique"
-    given-names: "Santiago"
-    email: "[email protected]"
-    affiliation: "Alliander" 
   - name: "Contributors to the LF Energy project Power Grid Model"
 contact:
   - name: "LF Energy project Power Grid Model"
-    email: "powergridmodel+help@lists.lfenergy.org"
+    email: "[email protected]"
 
 references:
   - title: "PowerGridModel/power-grid-model"
@@ -69,18 +74,27 @@ references:
         given-names: "Yu"
         email: "[email protected]"
         affiliation: "Alliander"
+        orcid: "https://orcid.org/0000-0001-5889-0067"
       - family-names: "Salemink"
         given-names: "Peter"
         email: "[email protected]"
         affiliation: "Alliander"
+      - family-names: "Westering"
+        name-particle: "van"
+        given-names: "Werner"
+        email: [email protected]
+        affiliation: "Alliander"
+        orcid: "https://orcid.org/0000-0002-4058-2581"
       - family-names: "Bharambe"
         given-names: "Nitish"
         email: "[email protected]"
         affiliation: "Alliander"
+        orcid: "https://orcid.org/0009-0007-9694-6077"
       - family-names: "Govers"
-        given-names: "Martinus"
+        given-names: "Martinus G.H."
         email: "[email protected]"
         affiliation: "Alliander"
+        orcid: "https://orcid.org/0009-0008-6890-8353"
       - family-names: "Bogaard"
         name-particle: "van den"
         given-names: "Jonas"
@@ -92,9 +106,15 @@ references:
         given-names: "Zhen"
         email: "[email protected]"
         affiliation: "Alliander"
+        orcid: "https://orcid.org/0000-0003-4317-6455"
       - family-names: "Guo"
-        given-names: "Jerry"
-        email: "[email protected]"
+        given-names: "Jerry Jinfeng"
+        email: "[email protected]"
+        affiliation: "Alliander"
+        orcid: "https://orcid.org/0000-0002-8065-4084"
+      - family-names: "Figueroa Manrique"
+        given-names: "Santiago"
+        email: "[email protected]"
         affiliation: "Alliander"
       - family-names: "Jagutis"
         given-names: "Laurynas"
@@ -109,10 +129,6 @@ references:
         given-names: "Marc"
         email: "[email protected]"
         affiliation: "Alliander"
-      - family-names: "Figueroa Manrique"
-        given-names: "Santiago"
-        email: "[email protected]"
-        affiliation: "Alliander" 
       - name: "Contributors to the LF Energy project Power Grid Model"
 
   - title: "Power grid model: A high-performance distribution grid calculation library"
@@ -121,6 +137,7 @@ references:
         given-names: "Yu"
         email: [email protected]
         affiliation: "Alliander"
+        orcid: "https://orcid.org/0000-0001-5889-0067"
       - family-names: "Salemink"
         given-names: "Peter"
         email: [email protected]
@@ -131,12 +148,39 @@ references:
         given-names: "Nitish"
         email: [email protected]
         affiliation: "Alliander"
+        orcid: "https://orcid.org/0009-0007-9694-6077"
       - family-names: "Westering"
         name-particle: "van"
         given-names: "Werner"
+        email: [email protected]
+        affiliation: "Alliander"
+        orcid: "https://orcid.org/0000-0002-4058-2581"
     conference:
       name: "CIRED 2023 - The 27th International Conference and Exhibition on Electricity Distribution"
     type: conference-paper
     year: 2023
     volume: 2023
     pages: "1-5"
+
+  - title: "PowerGridModel/power-grid-model-ds"
+    repository-code: "https://github.com/PowerGridModel/power-grid-model-ds"
+    doi: "10.5281/zenodo.14825565"
+    license: "MPL-2.0"
+    type: software-code
+    authors:
+      - family-names: "Schouten"
+        given-names: "Jaap"
+        email: [email protected]
+        affiliation: "Alliander"
+      - family-names: "Baaijen"
+        given-names: "Thijs"
+        email: [email protected]
+        affiliation: "Alliander"
+      - family-names: "Koppen"
+        given-names: "Vincent"
+        email: [email protected]
+      - family-names: "Voort"
+        name-particle: "van der"
+        given-names: "Sven"
+        email: [email protected]
+      - name: "Contributors to the LF Energy project Power Grid Model"

README.md

@@ -74,27 +74,29 @@ If you are using Power Grid Model IO in your research work, please consider citi
 
 ```bibtex
 @software{Xiang_PowerGridModel_power-grid-model-io,
-  author = {Xiang, Yu and Salemink, Peter and Bharambe, Nitish and Govers, Martinus and van den Bogaard, Jonas and Stoeller, Bram and Wang, Zhen and Guo, Jerry and Jagutis, Laurynas and Wang, Chenguang and {Contributors to the LF Energy project Power Grid Model}},
+  author = {Xiang, Yu and Salemink, Peter and Bharambe, Nitish and Govers, Martinus G.H. and van den Bogaard, Jonas and Stoeller, Bram and Wang, Zhen and Guo, Jerry Jinfeng and Figueroa Manrique, Santiago and Jagutis, Laurynas and Wang, Chenguang and {Contributors to the LF Energy project Power Grid Model}},
   doi = {10.5281/zenodo.8059257},
   license = {MPL-2.0},
   title = {{PowerGridModel/power-grid-model-io}},
   url = {https://github.com/PowerGridModel/power-grid-model-io}
 }
 @software{Xiang_PowerGridModel_power-grid-model,
-  author = {Xiang, Yu and Salemink, Peter and Bharambe, Nitish and Govers, Martinus and van den Bogaard, Jonas and Stoeller, Bram and Wang, Zhen and Guo, Jerry and Jagutis, Laurynas and Wang, Chenguang and van Raalte, Marc and {Contributors to the LF Energy project Power Grid Model}},
+  author = {Xiang, Yu and Salemink, Peter and van Westering, Werner and Bharambe, Nitish and Govers, Martinus G.H. and van den Bogaard, Jonas and Stoeller, Bram and Wang, Zhen and Guo, Jerry Jinfeng and Figueroa Manrique, Santiago and Jagutis, Laurynas and Wang, Chenguang and van Raalte, Marc and {Contributors to the LF Energy project Power Grid Model}},
   doi = {10.5281/zenodo.8054429},
   license = {MPL-2.0},
   title = {{PowerGridModel/power-grid-model}},
   url = {https://github.com/PowerGridModel/power-grid-model}
 }
 @inproceedings{Xiang2023,
   author = {Xiang, Yu and Salemink, Peter and Stoeller, Bram and Bharambe, Nitish and van Westering, Werner},
-  booktitle = {CIRED 2023 - The 27th International Conference and Exhibition on Electricity Distribution},
-  title = {Power grid model: A high-performance distribution grid calculation library},
-  year = {2023},
+  booktitle={27th International Conference on Electricity Distribution (CIRED 2023)},
+  title={Power grid model: a high-performance distribution grid calculation library},
+  year={2023},
   volume={2023},
-  number = {},
-  pages={1-5}
+  number={},
+  pages={1089-1093},
+  keywords={},
+  doi={10.1049/icp.2023.0633}
 }
 ```
 

pyproject.toml

@@ -26,9 +26,9 @@ classifiers=[
     "Operating System :: MacOS",
     "Topic :: Scientific/Engineering :: Physics",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
-    "numpy>=1.20",
+    "numpy>=1.20, <2.0",
     "openpyxl",
     "pandas",
     "power_grid_model>=1.8",
@@ -40,7 +40,7 @@ dynamic = ["version"]
 
 [project.optional-dependencies]
 dev = [
-    "pandapower>2.11.1",
+    "pandapower>2.11.1, <3.0",
     "pre-commit",
     "pylint",
     "pytest",
@@ -50,7 +50,7 @@ dev = [
 ]
 examples = [
     "power-grid-model>1.9.80",
-    "pandapower>2.11.1",
+    "pandapower>2.11.1, <3.0",
     "pyarrow", # Pyarrow support for Python 3.12 scheduled for 14.0.0: https://github.com/apache/arrow/issues/37880
 ]
 doc = [
@@ -85,7 +85,7 @@ addopts = ["--cov=power_grid_model_io", "--cov-report=term", "--cov-report=html:
 
 [tool.black]
 line-length = 120
-target-version = ["py310", "py311"]
+target-version = ["py311", "py312", "py313"]
 
 [tool.isort]
 profile = "black"

src/power_grid_model_io/functions/filters.py

@@ -31,7 +31,8 @@ def exclude_value(row: pd.Series, col: str, value: Union[float, str]) -> bool:
     if col not in row:
         raise ValueError(f"The column: '{col}' cannot be found for the filter")
     result = row[col] != value
-    if isinstance(result, pd.Series):
+    # Sonar cloud false positive (S2583): result can be a pd.Series of bool
+    if isinstance(result, pd.Series):  # NOSONAR
         return result.item()
     return result
 

src/power_grid_model_io/utils/uuid_excel_cvtr.py

@@ -3,13 +3,13 @@
 # SPDX-License-Identifier: MPL-2.0
 
 """
-    This is a stand-alone conversion script that converts the GUID based Vision 
-    excel files to a number based format. The script is designed to be used as 
-    a light weight tool to run before running the PGM-IO conversion scripts.
-    Example usage:
+This is a stand-alone conversion script that converts the GUID based Vision
+excel files to a number based format. The script is designed to be used as
+a light weight tool to run before running the PGM-IO conversion scripts.
+Example usage:
 
-    new_file = convert_guid_vision_excel("vision_97_en.xlsx", number="Number", {"N1": "Grounding1"})
-    nieuw_bestand = convert_guid_vision_excel("vision_97_nl.xlsx", number="Nummer", {"N1": "Arding1"})
+new_file = convert_guid_vision_excel("vision_97_en.xlsx", number="Number", {"N1": "Grounding1"})
+nieuw_bestand = convert_guid_vision_excel("vision_97_nl.xlsx", number="Nummer", {"N1": "Arding1"})
 
 """