pypsa 1.2.2__tar.gz → 1.2.3__tar.gz

{pypsa-1.2.2 → pypsa-1.2.3}/.github/workflows/test-models.yml

@@ -82,7 +82,7 @@ jobs:
 
     - name: Setup Pixi
       if: steps.filter.outputs.src == 'true' || github.event_name == 'schedule'
-      uses: prefix-dev/setup-pixi@v0.9.5
+      uses: prefix-dev/setup-pixi@v0.9.6
       with:
         pixi-version: v0.68.1
         cache: true

{pypsa-1.2.2/pypsa.egg-info → pypsa-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypsa
-Version: 1.2.2
+Version: 1.2.3
 Summary: Python for Power Systems Analysis
 Author-email: "PyPSA Developers, see https://docs.pypsa.org/latest/contributing/contributors.html" <t.brown@tu-berlin.de>
 License: MIT License
@@ -82,6 +82,7 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-mpl; extra == "dev"
 Requires-Dist: coverage; extra == "dev"
+Requires-Dist: matplotlib<3.11; extra == "dev"
 Requires-Dist: pypower; extra == "dev"
 Requires-Dist: pandapower>=2.14.11; extra == "dev"
 Requires-Dist: scikit-learn; extra == "dev"

{pypsa-1.2.2 → pypsa-1.2.3}/docs/release-notes.md

@@ -6,7 +6,7 @@ SPDX-License-Identifier: CC-BY-4.0
 
 # Release Notes
 
-## [**v1.2.2**](https://github.com/PyPSA/PyPSA/releases/tag/v1.2.2) <small>25th May 2026</small> { id="v1.2.2" }
+## [**v1.2.3**](https://github.com/PyPSA/PyPSA/releases/tag/v1.2.3) <small>12th June 2026</small> { id="v1.2.3" }
 
 <!--
 !!! info "Upcoming Release"
@@ -16,6 +16,21 @@ SPDX-License-Identifier: CC-BY-4.0
     to install the `master` branch, e.g. `pip install git+https://github.com/pypsa/pypsa`.
 -->
 
+### Features
+
+- Added compatibility with the stricter dimension alignment handling in the upcoming linopy `>=0.8`. (<!-- md:pr 1708 -->)
+
+### Bug Fixes
+
+- Fix [`n.optimize()`][pypsa.optimization.OptimizationAccessor.__call__] silently ignoring a static `p_set` attribute. (<!-- md:pr 1703 -->)
+
+- Fix optimization results being silently zeroed for components which are not yet present in the existing dynamic result data. Regression introduced in `v1.2.0`. (<!-- md:pr 1726 -->)
+
+- Avoid redundant traces and legends in interactive statistics bar plots when the color dimension duplicates an axis. (<!-- md:pr 1710 -->)
+
+
+## [**v1.2.2**](https://github.com/PyPSA/PyPSA/releases/tag/v1.2.2) <small>25th May 2026</small> { id="v1.2.2" }
+
 ### Bug Fixes
 
 - Fix the sign of [Loads](./user-guide/components/loads.md) not being taken into account in the nodal balance constraint when calling [`n.optimize()`][pypsa.optimization.OptimizationAccessor.__call__]. (<!-- md:pr 1685 -->)

{pypsa-1.2.2 → pypsa-1.2.3}/pyproject.toml

@@ -74,6 +74,7 @@ dev = [
     "pytest-cov",
     "pytest-mpl",
     "coverage",
+    "matplotlib<3.11", # remove when uv.lock is tracked
     "pypower",
     "pandapower>=2.14.11",
     "scikit-learn",
@@ -134,6 +135,9 @@ filterwarnings = [
     # Ignore linopy warnings
     "default:Coordinates across variables not equal. Perform outer join.:UserWarning",
     "ignore:In a future version of xarray the default value for join will change:FutureWarning",
+
+    # Ignore pandas<3.0.3 usage of the deprecated `locs` attribute of matplotlib>=3.11
+    "ignore:The locs attribute was deprecated:DeprecationWarning",
 ]
 markers = [
     "mpl_image_compare",

{pypsa-1.2.2 → pypsa-1.2.3}/pypsa/_options.py

@@ -301,7 +301,7 @@ class OptionsNode:
                 continue
 
             # PYPSA_GENERAL__ALLOW_NETWORK_REQUESTS -> general.allow_network_requests
-            option_path = env_var[len(prefix) :].replace("__", ".").lower()
+            option_path = env_var.removeprefix(prefix).replace("__", ".").lower()
 
             lower_value = env_value.lower()
             # Handle common booleans

{pypsa-1.2.2 → pypsa-1.2.3}/pypsa/clustering/spatial.py

@@ -29,11 +29,16 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
+def _sum_keep_na(s: Series) -> float:
+    """Sum keeping all nan groups as nan instead of collapsing them to 0."""
+    return s.sum(min_count=1)
+
+
 DEFAULT_ONE_PORT_STRATEGIES = {
     "p": "sum",
     "q": "sum",
-    "p_set": "sum",
-    "q_set": "sum",
+    "p_set": _sum_keep_na,
+    "q_set": _sum_keep_na,
     "p_nom": pd.Series.sum,  # resolve infinities, see https://github.com/pandas-dev/pandas/issues/54161
     "p_nom_max": pd.Series.sum,  # resolve infinities, see https://github.com/pandas-dev/pandas/issues/54161
     "p_nom_min": "sum",

{pypsa-1.2.2 → pypsa-1.2.3}/pypsa/optimization/common.py

@@ -53,7 +53,7 @@ def _set_dynamic_data(n: Network, component: str, attr: str, df: pd.DataFrame) -
         c.dynamic[attr] = df.reindex(n.snapshots)
 
     else:
-        c.dynamic[attr].update(df)
+        c.dynamic[attr] = df.combine_first(c.dynamic[attr])
 
     # Reindex to match network snapshots and component names
     result = c.dynamic[attr].reindex(n.snapshots, level="snapshot", axis=0)

{pypsa-1.2.2 → pypsa-1.2.3}/pypsa/optimization/constraints.py

@@ -1574,7 +1574,8 @@ def define_fixed_operation_constraints(
     c = as_components(n, component)
     attr_set = f"{attr}_set"
 
-    if attr_set not in c.dynamic.keys() or c.dynamic[attr_set].empty:
+    # Those internal guards should be removed and for Lines/ Transformers which are passive, the method should not even be called (clean up needed everywhere)
+    if attr_set not in c.dynamic.keys():
         return
 
     fix = c.da[attr_set].sel(snapshot=sns, name=c.active_assets)

{pypsa-1.2.2 → pypsa-1.2.3}/pypsa/optimization/mga.py

@@ -216,7 +216,6 @@ class OptimizationAbstractMGAMixin:
                     coeffs = pd.Series(coeffs)
                 if attr == nominal_attrs[c] and isinstance(coeffs, pd.Series):
                     coeffs = coeffs.reindex(self._n.c[c].extendables, fill_value=0)
-                    coeffs.index.name = ""
                 elif isinstance(coeffs, pd.Series):
                     coeffs = coeffs.reindex(columns=self._n.c[c].static.index)
                 elif isinstance(coeffs, pd.DataFrame):

{pypsa-1.2.2 → pypsa-1.2.3}/pypsa/plot/statistics/charts.py

@@ -649,6 +649,9 @@ class ChartGenerator(PlotsGenerator, ABC):
                 ldata[y], categories=ldata[y].unique(), ordered=True
             )
 
+        if kind == "bar" and color in {x, y}:
+            color = None
+
         # Prepare color mapping if color column is provided
         if color and color_discrete_map is None and color in ldata.columns:
             color_values = ldata[color].unique()

{pypsa-1.2.2 → pypsa-1.2.3/pypsa.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypsa
-Version: 1.2.2
+Version: 1.2.3
 Summary: Python for Power Systems Analysis
 Author-email: "PyPSA Developers, see https://docs.pypsa.org/latest/contributing/contributors.html" <t.brown@tu-berlin.de>
 License: MIT License
@@ -82,6 +82,7 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-mpl; extra == "dev"
 Requires-Dist: coverage; extra == "dev"
+Requires-Dist: matplotlib<3.11; extra == "dev"
 Requires-Dist: pypower; extra == "dev"
 Requires-Dist: pandapower>=2.14.11; extra == "dev"
 Requires-Dist: scikit-learn; extra == "dev"

{pypsa-1.2.2 → pypsa-1.2.3}/pypsa.egg-info/SOURCES.txt

@@ -462,6 +462,7 @@ test/test_network_cycles.py
 test/test_network_index.py
 test/test_network_transform.py
 test/test_objective_constant.py
+test/test_optimization_common.py
 test/test_optimization_expressions.py
 test/test_optional_dependencies.py
 test/test_options.py

{pypsa-1.2.2 → pypsa-1.2.3}/pypsa.egg-info/requires.txt

@@ -28,6 +28,7 @@ pytest
 pytest-cov
 pytest-mpl
 coverage
+matplotlib<3.11
 pypower
 pandapower>=2.14.11
 scikit-learn

{pypsa-1.2.2 → pypsa-1.2.3}/test/conftest.py

@@ -141,7 +141,7 @@ def stochastic_network():
 def ac_dc_solved():
     n = pypsa.examples.ac_dc_meshed()
     n.optimize()
-    del n.model.solver_model
+    n.model.solver_model = None
     return n
 
 

{pypsa-1.2.2 → pypsa-1.2.3}/test/test_lopf_basic_constraints.py

@@ -326,9 +326,11 @@ def test_define_generator_constraints():
     )
 
 
-def test_define_fixed_operational_constraints_positive():
+@pytest.mark.parametrize("mode", ["dynamic", "static", "mixed"])
+def test_define_fixed_operational_constraints_positive(mode):
     """
-    Test fixed operational constraints: fix to a positive value
+    Test fixed operational constraints: fix to a positive value, set statically,
+    dynamically, or both on the same snapshot
     """
     n = pypsa.Network()
     n.add("Bus", "bus0")
@@ -337,15 +339,26 @@ def test_define_fixed_operational_constraints_positive():
     n.add("Generator", "gen1", bus="bus0", p_nom=5, marginal_cost=5)
     n.add("Generator", "gen2", bus="bus0", p_nom=10, marginal_cost=9)
 
-    n.c.generators.dynamic.p_set["gen2"] = 10
+    if mode == "dynamic":
+        n.c.generators.dynamic.p_set["gen2"] = 8
+    elif mode == "static":
+        n.c.generators.static.loc["gen2", "p_set"] = 8
+    elif mode == "mixed":
+        n.c.generators.static.loc["gen2", "p_set"] = 8
+        n.c.generators.dynamic.p_set["gen1"] = 1
 
     n.optimize()
 
-    assert n.c.generators.dynamic.p["gen2"].eq(10).all()
-    assert n.c.generators.dynamic.p["gen0"].eq(0).all()
+    assert n.c.generators.dynamic.p["gen2"].eq(8).all()
+    if mode == "mixed":
+        assert n.c.generators.dynamic.p["gen1"].eq(1).all()
+        assert n.c.generators.dynamic.p["gen0"].eq(1).all()
+    else:
+        assert n.c.generators.dynamic.p["gen0"].eq(2).all()
 
 
-def test_define_fixed_operational_constraints_zero():
+@pytest.mark.parametrize("static", [False, True])
+def test_define_fixed_operational_constraints_zero(static):
     """
     Test fixed operational constraints: fix to a zero value
     """
@@ -356,7 +369,10 @@ def test_define_fixed_operational_constraints_zero():
     n.add("Generator", "gen1", bus="bus0", p_nom=5, marginal_cost=5)
     n.add("Generator", "gen2", bus="bus0", p_nom=10, marginal_cost=9)
 
-    n.c.generators.dynamic.p_set["gen0"] = 0
+    if static:
+        n.c.generators.static.loc["gen0", "p_set"] = 0
+    else:
+        n.c.generators.dynamic.p_set["gen0"] = 0
 
     n.optimize()
 
@@ -365,6 +381,36 @@ def test_define_fixed_operational_constraints_zero():
     assert n.c.generators.dynamic.p["gen2"].eq(5).all()
 
 
+@pytest.mark.parametrize("static", [False, True])
+def test_define_fixed_operational_constraints_storage_unit(static):
+    """
+    Test fixed operational constraints: StorageUnit p_set fixes the net power
+    p_dispatch - p_store
+    """
+    n = pypsa.Network()
+    n.add("Bus", "bus0")
+    n.add("Load", "load0", bus="bus0", p_set=10)
+    n.add("Generator", "gen0", bus="bus0", p_nom=20, marginal_cost=5)
+    n.add(
+        "StorageUnit",
+        "su0",
+        bus="bus0",
+        p_nom=10,
+        state_of_charge_initial=10,
+        marginal_cost=9,
+    )
+
+    if static:
+        n.c.storage_units.static.loc["su0", "p_set"] = 4
+    else:
+        n.c.storage_units.dynamic.p_set["su0"] = 4
+
+    n.optimize()
+
+    assert n.c.storage_units.dynamic.p["su0"].eq(4).all()
+    assert n.c.generators.dynamic.p["gen0"].eq(6).all()
+
+
 def test_define_fixed_operational_constraints_extendable():
     """
     Test fixed operational constraints: extendable component"

pypsa-1.2.3/test/test_optimization_common.py

@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: PyPSA Contributors
+#
+# SPDX-License-Identifier: MIT
+
+import pandas as pd
+
+import pypsa
+from pypsa.optimization.common import _set_dynamic_data
+
+
+def test_set_dynamic_data_preserves_and_extends_columns():
+    """Dynamic data of components added after a previous assignment must not be lost.
+
+    See https://github.com/PyPSA/PyPSA/issues/1723.
+    """
+    n = pypsa.Network()
+    n.set_snapshots(range(3))
+    n.add("Bus", "b")
+    n.add("Load", ["old", "new"], bus="b")
+    n.c.loads.dynamic.p = pd.DataFrame({"old": 1.0}, index=n.snapshots)
+
+    df = pd.DataFrame({"old": 3.0, "new": 2.0}, index=n.snapshots)
+    _set_dynamic_data(n, "Load", "p", df)
+
+    pd.testing.assert_frame_equal(n.c.loads.dynamic.p, df, check_names=False)

{pypsa-1.2.2 → pypsa-1.2.3}/test/test_statistics_plot_interactive.py

@@ -124,6 +124,15 @@ def test_iplot_stacked_parameter(ac_dc_network_r, stacked):
     assert isinstance(fig, go.Figure)
 
 
+def test_iplot_bar_drops_redundant_axis_color(ac_dc_network_r):
+    """Bar charts should not split traces when color duplicates an axis."""
+    fig = ac_dc_network_r.statistics.energy_balance.iplot.bar()
+
+    assert isinstance(fig, go.Figure)
+    assert len(fig.data) == 1
+    assert fig.data[0].showlegend is False
+
+
 def test_iplot_category_orders(ac_dc_network_r):
     """Test creating a plot with specified category orders."""
     # Create plot with specified orders if applicable columns exist