Merge branch 'copilot/fix-recursion-error-spatial-aggregation' into copilot/fix-notimplementederror-xr-merge

julian-belina · web-flow · commit b7e21e6eb893 · 2026-03-04T00:30:36.000+01:00
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,59 +1,54 @@
-{
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": [
-        "config:recommended"
-    ],
-    "schedule": [
-        "after 10pm on tuesday",
-        "before 6am on wednesday"
-    ],
-    "rangeStrategy": "widen",
-    "vulnerabilityAlerts": {
-        "enabled": false
-    },
-    "osvVulnerabilityAlerts": false,
-    "enabledManagers": [
-        "pep621",
-        "regex"
-    ],
-    "pep621": {
-        "managerFilePatterns": [
-            "/(^|/)pyproject\\.toml$/"
-        ]
-    },
-    "customManagers": [
-        {
-            "customType": "regex",
-            "managerFilePatterns": [
-                "/(^|/)requirements_dev\\.yml$/"
-            ],
-            "matchStrings": [
-                "- (?<depName>[a-zA-Z0-9_.-]+) (?<currentValue>[><=!][^\\n]*)"
-            ],
-            "packageNameTemplate": "conda-forge/{{{depName}}}",
-            "datasourceTemplate": "conda",
-            "versioningTemplate": "pep440"
-        }
-    ],
-    "ignoreDeps": [
-        "sphinx",
-        "sphinx_rtd_theme",
-        "myst-parser",
-        "ruff",
-        "nbval",
-        "pytest-xdist",
-        "pytest-cov",
-        "pytest",
-        "ipykernel",
-        "gurobi-logtools"
-    ],
-    "packageRules": [
-        {
-            "matchManagers": [
-                "pep621",
-                "regex"
-            ],
-            "groupName": "{{depName}}"
-        }
-    ]
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+        "config:recommended"
+    ],
+    "schedule": [
+        "after 10pm on tuesday",
+        "before 6am on wednesday"
+    ],
+    "rangeStrategy": "widen",
+    "vulnerabilityAlerts": {
+        "enabled": false
+    },
+    "osvVulnerabilityAlerts": false,
+    "enabledManagers": [
+        "pep621",
+        "custom.regex"
+    ],
+    "pep621": {
+        "managerFilePatterns": [
+            "/(^|/)pyproject\\.toml$/"
+        ]
+    },
+    "customManagers": [
+        {
+            "customType": "regex",
+            "managerFilePatterns": [
+                "/(^|/)requirements_dev\\.yml$/"
+            ],
+            "matchStrings": [
+                "- (?<depName>[a-zA-Z0-9_.-]+)[^\\n]*?(?<currentValue><=\\d[^\\n,]*)"
+            ],
+            "packageNameTemplate": "conda-forge/{{{depName}}}",
+            "datasourceTemplate": "conda",
+            "versioningTemplate": "pep440"
+        }
+    ],
+    "ignoreDeps": [
+        "sphinx",
+        "sphinx_rtd_theme",
+        "myst-parser",
+        "sphinx-rtd-theme",
+        "ruff",
+    ],
+    "packageRules": [
+        {
+            "matchManagers": [
+                "pep621",
+                "custom.regex"
+            ],
+            "groupName": "{{depName}}"
+        }
+    ]
 }
diff --git a/.github/workflows/test_pull_dev.yml b/.github/workflows/test_pull_dev.yml
@@ -38,13 +38,15 @@ jobs:
       fail-fast: false
       matrix:
         runner_tag: ["ubuntu-latest"]
-    uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_pypi_test.yml@main
+    uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_pypi_test_uv_miniforge.yml@main
     with:
       runner_tag: ${{ matrix.runner_tag }}
       ipynb_example_folder: "examples"
       python_version: ${{ needs.extract-python-versions.outputs.max_version }}
       optional_dependency_PyPI_tag: "[develop]"
       additional_conda_forge_dependencies: "glpk"
+      multiprocessing_pytest_string: "-n auto"
+      multiprocessing_example_string: "-n auto"
 
   extract-min-versions:
     if: github.actor != 'renovate[bot]'
diff --git a/.github/workflows/test_pull_request_renovate_max_versions.yml b/.github/workflows/test_pull_request_renovate_max_versions.yml
@@ -13,7 +13,7 @@ jobs:
   extract-versions:
     name: Extract max versions of changed libraries
     needs: detect-changes
-    if: needs.detect-changes.outputs.libraries != ''
+    if: startsWith(github.head_ref, 'renovate/') && needs.detect-changes.outputs.libraries != ''
     uses: FZJ-IEK3-VSA/.github/.github/workflows/_extract_env_versions_matrix.yml@main
     with:
       libraries: ${{ needs.detect-changes.outputs.libraries }}
@@ -23,6 +23,7 @@ jobs:
   TestRenovateMaxVersions:
     name: Test ${{ matrix.dependencies.library_name }} ${{ matrix.dependencies.version }} (max)
     needs: extract-versions
+    if: startsWith(github.head_ref, 'renovate/')
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/test_push.yml b/.github/workflows/test_push.yml
@@ -15,17 +15,21 @@ jobs:
       runner_tag: ${{ matrix.runner_tag }}
       requirements_file_name: requirements_dev.yml
       ipynb_example_folder: "examples"
+      multiprocessing_pytest_string: "-n auto"
+      multiprocessing_example_string: "-n auto"
 
   TestPushPyPIDev:
     name: Test PyPi development version on ${{ matrix.runner_tag }}
     strategy:
       fail-fast: false
       matrix:
         runner_tag: ["self-hosted"]
-    uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_pypi_test.yml@main
+    uses: FZJ-IEK3-VSA/.github/.github/workflows/_run_single_pypi_test_uv_miniforge.yml@main
     with:
       runner_tag: ${{ matrix.runner_tag }}
       ipynb_example_folder: "examples"
       python_version: "3.13"
       optional_dependency_PyPI_tag: "[develop]"
       additional_conda_forge_dependencies: "glpk"
+      multiprocessing_pytest_string: "-n auto"
+      multiprocessing_example_string: "-n auto"
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,50 +28,50 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Mathematics",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-keywords = ["energy assesment", "energy system", "optimization"]
+keywords = ["energy assessment", "energy system", "optimization"]
 dependencies = [
     "geopandas>=1.0.0,<=1.1.2",
     "openpyxl<=3.1.5",
-    "matplotlib<=3.9.2",
+    "matplotlib<=3.10.8",
     "xlrd>=1.2.0,<=2.0.2",
-    "pyomo>=6.8,<=6.9.4",
-    "numpy>=1.22,<=2.3.3",
-    "pandas>=1.4,<=2.2.3",
-    "scipy>=1.7.2,<=1.16.2",
-    "scikit-learn>=1.2,<=1.7.2",
-    "xarray>=2022.3.0,<=2025.10.1,!=2024.10.0,!=2024.11.0,!=2025.1.*,!=2025.3.*,!=2025.9.*",
-    "rasterio>=1.3.0,<=1.4.3,!=1.3.0.post1",
-    "netcdf4>1.5.8,<=1.7.3",
+    "pyomo>=6.8,<=6.10.0",
+    "numpy>=1.22,<=2.4.2",
+    "pandas>=1.4,<=2.3.3",
+    "scipy>=1.7.2,<=1.17.1",
+    "scikit-learn>=1.2,<=1.8.0",
+    "xarray>=2022.3.0,<=2026.2.0,!=2024.10.0,!=2024.11.0,!=2025.1.*,!=2025.3.*,!=2025.9.*",
+    "rasterio>=1.3.7,<=1.5.0,!=1.3.0.post1",
+    "netcdf4>1.5.8,<=1.7.4",
     "tsam>=2.0.1,<=2.3.9",
-    "pwlf>=2.0.4,<=2.5.1",
-    "psutil>=5.8.0,<=7.1.0",
+    "pwlf>=2.0.4,<=2.5.2",
+    "psutil>=5.8.0,<=7.2.2",
     "gurobi-logtools>=3.0.0,<=3.2.0",
-    "ipykernel<=6.29.5",
+    "ipykernel<=7.2.0",
 ]
 # <=3.13 translates to <=3.13.0, why the <3.14 is used
-requires-python = ">=3.10,<3.14"
+requires-python = ">=3.10,<3.15"
 
 [project.optional-dependencies]
 develop = [
     "sphinx<=7.4.4",
     "sphinx_rtd_theme<=2.0.0",
     "myst-parser<=2.0.0",
-    "pytest<=8.3.3",
-    "pytest-cov<=4.1.0",
-    "pytest-xdist<=3.6.1",
+    "pytest<=9.0.2",
+    "pytest-cov<=7.0.0",
+    "pytest-xdist<=3.8.0",
     "nbval<=0.11.0",
     "ruff<0.7.0",
 ]
 
-#Configureation options
+# Configuration options
 # https://docs.pytest.org/en/7.1.x/reference/reference.html#configuration-options
 [tool.pytest.ini_options]
 testpaths = ["test"]
 console_output_style = "progress"
 # How to configure Filterwarning:
 # https://docs.python.org/3/library/warnings.html#warning-filter
 # action:message:category:module:line
-# Omit a field by add ing ":" for each omitted field
+# Omit a field by adding ":" for each omitted field
 # Actions are: "default"
 # "error", "ignore", "always", "module", "once"
 filterwarnings = []
diff --git a/requirements_dev.yml b/requirements_dev.yml
@@ -5,34 +5,34 @@ channels:
   - nodefaults
 
 dependencies:
-  - python >=3.10,<=3.13
+  - python >=3.10,<=3.13.12
   - pip
   - geopandas >=1.0.0,<=1.1.2
   - glpk >=4.63,<=5.0
   - openpyxl <=3.1.5
-  - matplotlib <=3.9.2
+  - matplotlib <=3.10.8
   - xlrd >=1.2.0,<=2.0.2
-  - pyomo >=6.8,<=6.9.4
-  - numpy >=1.22,<=2.3.3
-  - pandas >=1.4,<=2.2.3
-  - scipy >=1.7.2,<=1.16.2
-  - scikit-learn >=1.2,<=1.7.2
-  - xarray >=2022.3.0,<=2025.10.1,!=2024.10.0,!=2024.11.0,!=2025.1.*,!=2025.3.*,!=2025.9.*
-  - rasterio >=1.3.7,<=1.4.3
-  - netcdf4 >1.6.4,<=1.7.3
+  - pyomo >=6.8,<=6.10.0
+  - numpy >=1.22,<=2.4.2
+  - pandas >=1.4,<=2.3.3
+  - scipy >=1.7.2,<=1.17.1
+  - scikit-learn >=1.2,<=1.8.0
+  - xarray >=2022.3.0,<=2026.2.0,!=2024.10.0,!=2024.11.0,!=2025.1.*,!=2025.3.*,!=2025.9.*
+  - rasterio >=1.3.7,<=1.5.0
+  - netcdf4 >1.6.4,<=1.7.4
   - tsam >=2.0.1,<=2.3.9
-  - pwlf >=2.0.4,<=2.5.1
-  - psutil >=5.8.0,<=7.1.0
+  - pwlf >=2.0.4,<=2.5.2
+  - psutil >=5.8.0,<=7.2.2
   - gurobi-logtools >=3.0.0,<=3.2.0
   # Examples
-  - ipykernel <=6.29.5
+  - ipykernel <=7.2.0
   # develop
-  - pytest <=8.3.3
-  - pytest-cov <=4.1.0
-  - pytest-xdist <=3.6.1
+  - pytest <=9.0.2
+  - pytest-cov <=7.0.0
+  - pytest-xdist <=3.8.0
   - nbval <=0.11.0
   - ruff <=0.13.1
-  # Docuementation
+  # Documentation
   - sphinx <=7.4.7
   - sphinx_rtd_theme <=2.0.0
   - myst-parser <=2.0.0
