pypsa 1.2.3__tar.gz → 1.2.4__tar.gz

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

@@ -107,14 +107,14 @@ jobs:
     - name: Run unit tests (old API)
       if: matrix.api == 'default'
       run: >
-        uv run pytest  --mpl --mpl-generate-summary=html --mpl-results-path=mpl-results
+        uv run pytest
         --cov=pypsa --junitxml=junit.xml -o junit_family=legacy
         && uv run coverage xml
 
     - name: Run unit tests (pandas 3)
       if: matrix.api == 'pandas3'
       run: >
-        uv run --no-sync pytest  --mpl --mpl-generate-summary=html --mpl-results-path=mpl-results
+        uv run --no-sync pytest
         --cov=pypsa --junitxml=junit.xml -o junit_family=legacy
         && uv run --no-sync coverage xml
 
@@ -123,20 +123,9 @@ jobs:
       run: >
         uv run pytest
         --new-components-api
-        --mpl --mpl-generate-summary=html --mpl-results-path=mpl-results
         --cov=pypsa --junitxml=junit.xml -o junit_family=legacy
         && uv run coverage xml
 
-    - name: Upload artifacts
-      if: matrix.api == 'default' && matrix.os == 'macos-latest' && matrix.python-version == '3.13'
-      uses: actions/upload-artifact@v7
-      with:
-        name: results-plotting
-        path: |
-          mpl-results
-        retention-days: 14
-        if-no-files-found: ignore
-
     - name: Upload code coverage report
       if: ${{ !cancelled() }}
       uses: codecov/codecov-action@v6
@@ -159,6 +148,51 @@ jobs:
           python${{ matrix.python-version }},
           api-${{ matrix.api }}
 
+  test-plots:
+    # Run the matplotlib image-comparison tests once, on a single instance.
+    # Baselines are generated on Linux; see test/test_statistics_plot.py.
+    name: Test plots
+    needs: [build]
+    runs-on: ubuntu-latest
+    env:
+      MPLBACKEND: Agg # https://github.com/orgs/community/discussions/26434
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        fetch-depth: 0   # Needed for setuptools_scm
+
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v6
+      with:
+        python-version: 3.13
+
+    - name: Download package
+      uses: actions/download-artifact@v8
+      with:
+        name: Packages
+        path: dist
+
+    - name: Install package and dependencies
+      run: |
+        python -m pip install uv
+        uv sync --all-extras --no-install-project
+        uv pip install "$(ls dist/*.whl)"
+
+    - name: Run image comparison tests
+      run: >
+        uv run pytest --run-plot-tests -m mpl_image_compare
+        --mpl --mpl-generate-summary=html --mpl-results-path=mpl-results
+
+    - name: Upload artifacts
+      if: ${{ !cancelled() }}
+      uses: actions/upload-artifact@v7
+      with:
+        name: results-plotting
+        path: |
+          mpl-results
+        retention-days: 14
+        if-no-files-found: ignore
+
   check-docs:
     name: Check docs
     needs: [build]

{pypsa-1.2.3 → pypsa-1.2.4}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) 2015-2026 PyPSA contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
 associated documentation files (the "Software"), to deal in the Software without restriction, including

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

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: pypsa
-Version: 1.2.3
+Version: 1.2.4
 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
         
-        Copyright (c) <year> <copyright holders>
+        Copyright (c) 2015-2026 PyPSA contributors
         
         Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
         associated documentation files (the "Software"), to deal in the Software without restriction, including
@@ -77,11 +77,13 @@ Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-mpl; extra == "test"
 Requires-Dist: coverage; extra == "test"
+Requires-Dist: pyarrow; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-mpl; extra == "dev"
 Requires-Dist: coverage; extra == "dev"
+Requires-Dist: pyarrow; extra == "dev"
 Requires-Dist: matplotlib<3.11; extra == "dev"
 Requires-Dist: pypower; extra == "dev"
 Requires-Dist: pandapower>=2.14.11; extra == "dev"

{pypsa-1.2.3 → pypsa-1.2.4}/docs/examples/imperfect-competition.ipynb

@@ -62,7 +62,7 @@
     "\n",
     "The Cournot equilibrium among $N$ players can be characterised as the solution to a **single optimisation problem**. Margaret Slade's [1994 paper](https://www.jstor.org/stable/2950588) calls it a \"fictitious-objective function\" that reproduces equilibrium game results. The paper shows that for the homogeneous Cournot game, linear demand is sufficient for the existence of such a fictitious objective.\n",
     "\n",
-    "Ben Hobbs also explored this topic in [2001 paper](https://hobbsgroup.johnshopkins.edu/docs/papers/IEEE_Hobbs_2001_LCP00918286.pdf) by studying properties of MCP and LCP (Linear Complementarity Problem) formulations. The paper concludes: \"The key assumption that permits their [KKT-based equilibrium] formulation as LCPs is that each producer naively assumes that its output will not affect transmission prices\" - so another condition for the existence of a fictitious objective is that there is no binding network constraints that create asymmetric shadow prices across strategic players.\n",
+    "Ben Hobbs also explored this topic in [2001 paper](https://hobbsgroup.johnshopkins.edu/docs/papers/IEEE_Hobbs_2001_LCP00918286.pdf) by studying properties of MCP and LCP (Linear Complementarity Problem) formulations. The paper concludes: \"The key assumption that permits their [KKT-based equilibrium] formulation as LCPs is that each producer naively assumes that its output will not affect transmission prices\" - so another condition for the existence of a fictitious objective is that players treat transmission prices as fixed (the player's perceived derivative of the transmission shadow price with respect to its own output is zero), so congestion enters every player's problem as a linear term.\n",
     "\n",
     "Let's work through the math, then see it in action in PyPSA."
    ]

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

@@ -6,9 +6,9 @@ SPDX-License-Identifier: CC-BY-4.0
 
 # Release Notes
 
-## [**v1.2.3**](https://github.com/PyPSA/PyPSA/releases/tag/v1.2.3) <small>12th June 2026</small> { id="v1.2.3" }
-
 <!--
+## Upcoming Release
+
 !!! info "Upcoming Release"
 
     The features listed below have not yet been released, but will be included in the
@@ -16,6 +16,47 @@ SPDX-License-Identifier: CC-BY-4.0
     to install the `master` branch, e.g. `pip install git+https://github.com/pypsa/pypsa`.
 -->
 
+## [**v1.2.4**](https://github.com/PyPSA/PyPSA/releases/tag/v1.2.4) <small>27th June 2026</small> { id="v1.2.4" }
+
+### Bug Fixes
+
+- Fix `optimize()` and [`export_to_netcdf()`][pypsa.Network.export_to_netcdf] failing under pandas `>= 3.0` / `future.infer_string`. String labels are now converted back to `object` on both import and export. (<!-- md:pr 1687 -->)
+
+- Fixed the `suffix` argument of [`n.add`][pypsa.Network.add] and [`n.remove`][pypsa.Network.remove]. Passing a list to both `name` and `suffix` now raises an error instead of silently pairing them. (<!-- md:pr 1682 -->)
+
+- Fixed a collection of issues in the [`n.statistics.*.plot`/`.iplot`][pypsa.statistics.StatisticsAccessor] accessors (<!-- md:pr 1721 -->):
+    - `color=None` now disables color grouping instead of falling back to `"carrier"`.
+    - Passing an unsupported filter (e.g. `carrier` to `prices`) now raises a clear error instead of being silently dropped.
+    - Distribution plots (`box`/`violin`/`histogram`) default to the full time series so they show real distributions.
+    - `box`/`violin` figure height scales with the number of categorical rows (capped at 30 inches).
+    - Static `line`/`scatter` plots honor carrier colors via the palette.
+    - Requested but empty facets stay visible instead of being silently dropped.
+    - `sharex=False`/`sharey=False` keeps tick labels on all faceted subplots.
+    - Interactive plots with a categorical y-axis label every bar and scale the figure height with the number of rows (capped at 2000 pixels), instead of thinning tick labels.
+    - Static faceted plots now accept `col_wrap` to wrap facets across rows.
+    - Multi-period statistics (e.g. `optimal_capacity`) name their per-period columns `period`, so line/area plots no longer fail with `KeyError: 'period'`.
+    - A dimension mapped to `x`/`y`/`color` (e.g. `x="period"`) is no longer also used as an automatic facet.
+    - Filtering by `carrier`/`bus_carrier` on a [`NetworkCollection`][pypsa.NetworkCollection] (or stochastic network) with `nice_names=True` no longer raises `NotImplementedError`.
+    - Non-bar plots of a collection (or stochastic network) of multi-period networks now facet by both the collection/scenario dimension and the period, instead of dropping the period (which made area plots fail with `cannot reshape` and line plots overlap periods).
+    - [`n.statistics.prices`][pypsa.statistics.StatisticsAccessor.prices] accepts any static bus attribute (e.g. `country`) in `groupby`, and its plot accessors support these as dimensions (e.g. `prices.plot.box(facet_row="country")`) instead of failing with a `KeyError`.
+    - Interactive plots render LaTeX carrier names and categorical axes correctly with `pandas>=3` (string-dtype columns).
+- Passing `groupby_time=False` to [`n.statistics.system_cost`][pypsa.statistics.StatisticsAccessor.system_cost] is deprecated and will raise in v2.0; it has no per-snapshot resolution as it includes static capital expenditure. Use `opex(groupby_time=False)` for the time-resolved operational cost. (<!-- md:pr 1721 -->)
+
+- Fix ramp limit constraints spuriously linking across investment period boundaries in multi-investment optimization. Ramp constraints now reset at the first snapshot of each period instead of only at the global first snapshot, which could render feasible pathway models infeasible. (<!-- md:pr 1746 -->)
+
+- Fix temporal clustering producing `*_min_pu > *_max_pu` for some snapshots. Aggregated lower bounds are now clipped to their paired upper bound, both for the floating-point drift in [`segment()`][pypsa.clustering.temporal.TemporalClusteringMixin.segment] and the `e_min_pu`/`e_max_pu` crossover from min/max aggregation rules. (<!-- md:pr 1752 -->)
+
+- Fix `KeyError` in [`n.pf()`][pypsa.network.power_flow.NetworkPowerFlowMixin.pf] and [`n.lpf()`][pypsa.network.power_flow.NetworkPowerFlowMixin.lpf] when a network contains multiple sub-networks and one of them has no transformers (or otherwise lacks a passive branch component present in another sub-network). (<!-- md:pr 1754 -->)
+
+- Fix the sign of the shunt susceptance when importing from pandapower. A shunt with `q_mvar > 0` (inductive) was previously imported with the wrong sign, causing the power flow to diverge from pandapower. (<!-- md:pr 1758 -->)
+
+- A warning is now logged when manually set impedance parameters (`r`, `x`, `g`, `b`, `s_nom`) on transformers or lines with a standard `type` are overridden by the type during [`n.calculate_dependent_values()`][pypsa.network.power_flow.NetworkPowerFlowMixin.calculate_dependent_values], instead of silently discarding them. (<!-- md:pr 1759 -->)
+
+- Fix the `snapshot` index name being dropped from dynamic data when reassigning [`n.snapshots`][pypsa.Network.snapshots]. (<!-- md:pr 1745 -->)
+
+
+## [**v1.2.3**](https://github.com/PyPSA/PyPSA/releases/tag/v1.2.3) <small>12th June 2026</small> { id="v1.2.3" }
+
 ### Features
 
 - Added compatibility with the stricter dimension alignment handling in the upcoming linopy `>=0.8`. (<!-- md:pr 1708 -->)

{pypsa-1.2.3 → pypsa-1.2.4}/docs/user-guide/power-flow.md

@@ -115,6 +115,9 @@ v_0 \\ v_1
 
 The transformer models here are largely based on the implementation in [pandapower](https://github.com/panda-power/pandapower), which is loosely based on [DIgSILENT PowerFactory](http://www.digsilent.de/index.php/products-powerfactory.html).
 
+!!! note "Impedance units"
+    Transformer `r`, `x`, `g`, `b` are given in per unit (base power `s_nom`, base voltage `v_nom`), as found on transformer datasheets, whereas line impedances are given in physical units (Ω and S). PyPSA rescales the transformer impedances to a common 1 MVA base via `x_pu = x / s_nom`.
+
 Transformers are modelled either with the equivalent T model (the default, since this represents the physics better) or with the equivalent PI model. The can be controlled by setting transformer attribute `model` to either "t" or "pi".
 
 The tap changer can either be modelled on the primary, high voltage side 0 (the default) or on the secondary, low voltage side 1. This is set with attribute `tap_side`.

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

@@ -68,12 +68,14 @@ test = [
     "pytest-cov",
     "pytest-mpl",
     "coverage",
+    "pyarrow",
 ]
 dev = [
     "pytest",
     "pytest-cov",
     "pytest-mpl",
     "coverage",
+    "pyarrow",
     "matplotlib<3.11", # remove when uv.lock is tracked
     "pypower",
     "pandapower>=2.14.11",
@@ -138,6 +140,10 @@ filterwarnings = [
 
     # Ignore pandas<3.0.3 usage of the deprecated `locs` attribute of matplotlib>=3.11
     "ignore:The locs attribute was deprecated:DeprecationWarning",
+
+    # numpy>=2.5 deprecations not yet handled by netCDF4 and matplotlib
+    "ignore:Setting the shape on a NumPy array has been deprecated:DeprecationWarning",
+    "ignore:The 'generic' unit for NumPy timedelta is deprecated:DeprecationWarning",
 ]
 markers = [
     "mpl_image_compare",

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/clustering/temporal.py

@@ -57,6 +57,28 @@ TEMPORAL_AGGREGATION_DEFAULTS: dict[str, str] = {
 }
 
 
+def _enforce_pu_bounds(n: Network) -> None:
+    """Clip aggregated `*_min_pu` series so they never exceed `*_max_pu`.
+
+    Aggregation can lift a lower bound above its paired upper bound, either from
+    floating-point error (segmentation normalises per column) or from min/max
+    aggregation rules (`e_min_pu` uses `max`, `e_max_pu` uses `min`).
+    """
+    for c in n.components:
+        for min_attr in [a for a in c.dynamic if a.endswith("_min_pu")]:
+            max_attr = min_attr.replace("_min_pu", "_max_pu")
+            if max_attr not in c.dynamic:
+                continue
+            min_df = c.dynamic[min_attr]
+            max_df = c.dynamic[max_attr]
+            common = min_df.columns.intersection(max_df.columns)
+            if common.empty:
+                continue
+            c.dynamic[min_attr].loc[:, common] = min_df[common].clip(
+                upper=max_df[common]
+            )
+
+
 @dataclass
 class TemporalClustering:
     """Result of temporal clustering.
@@ -74,6 +96,10 @@ class TemporalClustering:
     n: Network
     snapshot_map: pd.Series
 
+    def __post_init__(self) -> None:
+        """Sanitize time clustered data."""
+        _enforce_pu_bounds(self.n)
+
 
 def _get_aggregation_rule(
     attr: str,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/common.py

@@ -384,7 +384,11 @@ def equals(
             try:
                 if isinstance(a, pd.DataFrame):
                     pd_testing.assert_frame_equal(
-                        a, b, check_dtype=False, check_index_type=False
+                        a,
+                        b,
+                        check_dtype=False,
+                        check_index_type=False,
+                        check_column_type=False,
                     )
                 elif isinstance(a, pd.Series):
                     pd_testing.assert_series_equal(

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/buses.py

@@ -46,7 +46,7 @@ class Buses(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/carriers.py

@@ -47,7 +47,7 @@ class Carriers(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/generators.py

@@ -74,7 +74,7 @@ class Generators(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/global_constraints.py

@@ -42,7 +42,7 @@ class GlobalConstraints(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/line_types.py

@@ -42,7 +42,7 @@ class LineTypes(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/lines.py

@@ -80,7 +80,7 @@ class Lines(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/links.py

@@ -84,7 +84,7 @@ class Links(_Multiport):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/loads.py

@@ -38,7 +38,7 @@ class Loads(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/processes.py

@@ -81,7 +81,7 @@ class Processes(_Multiport):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/shapes.py

@@ -35,7 +35,7 @@ class Shapes(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/shunt_impedances.py

@@ -35,7 +35,7 @@ class ShuntImpedances(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/storage_units.py

@@ -76,7 +76,7 @@ class StorageUnits(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/stores.py

@@ -71,7 +71,7 @@ class Stores(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/sub_networks.py

@@ -42,7 +42,7 @@ class SubNetworks(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/transformer_types.py

@@ -42,7 +42,7 @@ class TransformerTypes(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/_types/transformers.py

@@ -74,7 +74,7 @@ class Transformers(Components):
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/transform.py

@@ -42,7 +42,7 @@ class ComponentsTransformMixin:
     def add(
         self,
         name: str | int | Sequence[int | str],
-        suffix: str = "",
+        suffix: str | Sequence[str] = "",
         overwrite: bool = False,
         return_names: bool | None = None,
         **kwargs: Any,
@@ -72,8 +72,9 @@ class ComponentsTransformMixin:
         ----------
         name : str or int or list of str or list of int
             Component name(s)
-        suffix : str, default ""
-            All components are named after name with this added suffix.
+        suffix : str or list of str, default ""
+            Suffix added to each name. Pass a list together with a single `name`
+            to add one component per suffix.
         overwrite : bool, default False
             If True, existing components with the same names as in `name` will be
             overwritten. Otherwise only new components will be added and others will be

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/components/types.py

@@ -10,19 +10,23 @@ Additional types can be added by the user.
 
 from __future__ import annotations
 
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import numpy as np
 import pandas as pd
 
 from pypsa.common import list_as_string
+from pypsa.constants import PYPSA_DATA_DIR
 from pypsa.definitions.components import ComponentType
 from pypsa.deprecations import COMPONENT_ALIAS_DICT
 
+if TYPE_CHECKING:
+    from importlib.resources.abc import Traversable
+
 # TODO better path handeling, integrate custom components
-_components_path = Path(__file__).parent.parent / "data" / "components.csv"
-_attrs_path = Path(__file__).parent.parent / "data" / "component_attrs"
-_standard_types_path = Path(__file__).parent.parent / "data" / "standard_types"
+_components_path = PYPSA_DATA_DIR / "components.csv"
+_attrs_path = PYPSA_DATA_DIR / "component_attrs"
+_standard_types_path = PYPSA_DATA_DIR / "standard_types"
 
 component_types_df = pd.read_csv(_components_path, index_col=0)
 default_components = component_types_df.index.to_list()
@@ -136,7 +140,9 @@ def add_component_type(
 
 
 def _load_default_component_types(
-    component_df: pd.DataFrame, attrs_path: Path, standard_types_path: Path
+    component_df: pd.DataFrame,
+    attrs_path: Traversable,
+    standard_types_path: Traversable,
 ) -> None:
     """Load default component types from package data.
 
@@ -146,16 +152,16 @@ def _load_default_component_types(
     ----------
     component_df : pandas.DataFrame
         DataFrame which lists all default components. E.g. `/pypsa/data/components.csv`.
-    attrs_path : pathlib.Path
+    attrs_path : importlib.resources.abc.Traversable
         Path to the default attributes dir. E.g. `/pypsa/data/default_components/`.
-    standard_types_path : pathlib.Path
+    standard_types_path : importlib.resources.abc.Traversable
         Path to the standard types dir. E.g. `/pypsa/data/standard_types/`.
 
     """
     for c_name, row in component_df.iterrows():
         # Read in defaults attributes
         attrs_file_path = attrs_path / f"{row.list_name}.csv"
-        if not attrs_file_path.exists():
+        if not attrs_file_path.is_file():
             msg = (
                 f"Could not find {attrs_path}. For each component, there must be a "
                 "corresponding file for its attributes."
@@ -165,7 +171,7 @@ def _load_default_component_types(
 
         # Read in standard types
         types_paths = standard_types_path / f"{row.list_name}.csv"
-        if not types_paths.exists():
+        if not types_paths.is_file():
             standard_types = None
         else:
             standard_types = pd.read_csv(types_paths, index_col=0)

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/constants.py

@@ -4,8 +4,11 @@
 
 """Constants."""
 
+import importlib.resources
 import re
 
+PYPSA_DATA_DIR = importlib.resources.files("pypsa") / "data"
+
 DEFAULT_EPSG = 4326
 DEFAULT_TIMESTAMP = "now"
 EARTH_RADIUS = 6378137.0  # equitorial radius in meters

{pypsa-1.2.3 → pypsa-1.2.4}/pypsa/data/component_attrs/processes.csv

@@ -9,7 +9,7 @@ rate1,static or series,per unit,1,"Rate of energy transfer at `bus1` relative to
 active,boolean,n/a,True,"Whether to consider the component in basic functionality or not",Input (optional)
 build_year,int,year,0,Build year,Input (optional)
 lifetime,float,years,inf,Lifetime,Input (optional)
-p_nom,float,MW,0,Limit of power which can pass through process (in units of `bus0`). Ignored if `p_nom_extendable=True`.,Input (optional)
+p_nom,float,MW,0,"Limit of internal power `p` which can pass through process (in units of `p`, which equals the flow at any bus whose `rate` is set to ±1; with the default `rate0=-1` this is the flow at `bus0`). Ignored if `p_nom_extendable=True`.",Input (optional)
 p_nom_mod,float,MW,0,Unit size of process module (e.g. fixed blocks of 100 MW).,Input (optional)
 p_nom_extendable,boolean,n/a,False,Switch to allow capacity `p_nom` to be extended.,Input (optional)
 p_nom_min,float,MW,0,"If `p_nom_extendable=True`, set its minimum value.",Input (optional)
@@ -19,16 +19,16 @@ p_set,static or series,MW,n/a,The dispatch set point for `p0` of the process (fo
 p_init,static,MW,n/a,Active power used as a starting point for limiting the ramp in the very first snapshot (for optimisation),Input (optional)
 p_min_pu,static or series,per unit of p_nom,0.,Minimal dispatch per unit of `p_nom` for the process. Can also be negative.,Input (optional)
 p_max_pu,static or series,per unit of p_nom,1.,Maximal dispatch per unit of `p_nom` for the process. Can also be negative.,Input (optional)
-capital_cost,float,currency/MW,0,"Fixed period costs of extending `p_nom` by 1 MW (unit of `bus0`, e.g. annuitized investment costs). Used directly unless `overnight_cost` is specified. Any `length` factor must already be included.",Input (optional)
-overnight_cost,float,currency/MW,NaN,"Overnight (upfront) investment cost per MW (unit of `bus0`). If specified, PyPSA calculates annuity using `discount_rate` and `lifetime`. Takes precedence over `capital_cost`.",Input (optional)
+capital_cost,float,currency/MW,0,"Fixed period costs of extending `p_nom` by 1 MW (unit of internal power `p`, e.g. annuitized investment costs). Used directly unless `overnight_cost` is specified. Any `length` factor must already be included.",Input (optional)
+overnight_cost,float,currency/MW,NaN,"Overnight (upfront) investment cost per MW (unit of internal power `p`). If specified, PyPSA calculates annuity using `discount_rate` and `lifetime`. Takes precedence over `capital_cost`.",Input (optional)
 discount_rate,float,per unit,NaN,"Discount rate for annuity calculation when using `overnight_cost`. Supports 0% rate (simple depreciation).",Input (optional)
-fom_cost,float,currency/MW,0,"Fixed period operation and maintenance costs per MW (unit of `bus0`), added to annuitized investment cost.",Input (optional)
-marginal_cost,static or series,currency/MWh,0.,Marginal cost of 1 MWh consumption from `bus0` (e.g. including variable operation and maintenance costs of an electrolyser but excluding electricity costs).,Input (optional)
-marginal_cost_quadratic,static or series,currency/MWh,0.,Quadratic marginal cost for 1 MWh of consumption from `bus0`.,Input (optional)
+fom_cost,float,currency/MW,0,"Fixed period operation and maintenance costs per MW (unit of internal power `p`), added to annuitized investment cost.",Input (optional)
+marginal_cost,static or series,currency/MWh,0.,Marginal cost of 1 MWh of internal power `p` (e.g. including variable operation and maintenance costs of an electrolyser but excluding electricity costs). Equals the cost per MWh at `bus0` when `rate0=-1`.,Input (optional)
+marginal_cost_quadratic,static or series,currency/MWh,0.,Quadratic marginal cost for 1 MWh of internal power `p`.,Input (optional)
 stand_by_cost,static or series,currency/h,0.,Stand-by cost for operating the process. This cost is incurred whenever the status is 1 (including when dispatch decision is zero).,Input (optional)
 length,float,km,0,"Length of the process. Useful for calculating `capital_cost` for HVDC connections.",Input (optional)
 terrain_factor,float,per unit,1,Terrain factor for increasing `capital_cost` calculated from `length`.,Input (optional)
-committable,boolean,n/a,False,Apply unit commitment constraints. This is only possible with `p_nom_extendable=False`.,Input (optional)
+committable,boolean,n/a,False,Apply unit commitment constraints.,Input (optional)
 start_up_cost,float,currency,0,Cost to start up the process. Only used if `committable=True`.,Input (optional)
 shut_down_cost,float,currency,0,Cost to shut down the process. Only used if `committable=True`.,Input (optional)
 min_up_time,int,snapshots,0,Minimum number of snapshots for status to be 1.  Only used if `committable=True`. Does not consider snapshot weightings.,Input (optional)