From cdaa20fd83dd97aed82be45f97a6889c09fea757 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 10 Feb 2026 19:15:21 +0100 Subject: [PATCH 1/4] limit to pandas <3 temporarily --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3add57f5..e9b0012c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ requires-python = ">=3.10" dependencies = [ "numpy", "scipy", - "pandas>=0.24.0", + "pandas>=0.24.0,<3", "networkx>=1.10", "pycountry", "country_converter", From bc257ffd730187999aed2f45982e21c3998647fc Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 11 Feb 2026 09:31:03 +0100 Subject: [PATCH 2/4] fix \w regex --- powerplantmatching/cleaning.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powerplantmatching/cleaning.py b/powerplantmatching/cleaning.py index 432866e1..c4df7961 100644 --- a/powerplantmatching/cleaning.py +++ b/powerplantmatching/cleaning.py @@ -123,9 +123,9 @@ def clean_name(df, config=None): # do not remove block letters for fuel types with blocks; the regular # regex \w would remove standalone letters, this one is skipped for # fueltypes in mask - elif key == "" and "\w" in pattern: + elif key == "" and r"\w" in pattern: pattern_keep = r"(?i)" + "|".join( - [rf"\b{p}\b" for p in pattern if p != "\w"] + [rf"\b{p}\b" for p in pattern if p != r"\w"] ) pattern_default = r"(?i)" + "|".join([rf"\b{p}\b" for p in pattern]) name.loc[mask] = name.loc[mask].str.replace(pattern_keep, key, regex=True) From e24cd18cd0c7a2615f187e402af6466c1fa20786 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 11 Feb 2026 09:31:30 +0100 Subject: [PATCH 3/4] add Python 3.14 to supported versions --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index e9b0012c..f8626379 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,6 +20,7 @@ classifiers=[ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Environment :: Console", "Intended Audience :: Science/Research", "License :: OSI Approved :: MIT License", From 8f76c1cbf7788f8b5d32d511882df39d179ee237 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 11 Feb 2026 09:33:30 +0100 Subject: [PATCH 4/4] add docs/powerplants.png to REUSE.toml --- REUSE.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/REUSE.toml b/REUSE.toml index 5bd0e304..a0f8a6e3 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -7,6 +7,7 @@ SPDX-PackageDownloadLocation = "https://github.com/pypsa/powerplantmatching" path = [ "powerplants.csv", "docs/assets/images/powerplants.png", + "docs/powerplants.png", "docs/examples/example.ipynb", ] SPDX-FileCopyrightText = "Contributors to powerplantmatching "