Skip to content

limit to pandas <3 temporarily #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fneum merged 4 commits into from
Feb 11, 2026
Merged

limit to pandas <3 temporarily #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdaa20f
limit to pandas <3 temporarily
fneum Feb 10, 2026
bc257ff
fix \w regex
fneum Feb 11, 2026
e24cd18
add Python 3.14 to supported versions
fneum Feb 11, 2026
8f76c1c
add docs/powerplants.png to REUSE.toml
fneum Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions REUSE.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/pypsa/powerplantmatching>"
Expand Down
4 changes: 2 additions & 2 deletions powerplantmatching/cleaning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -32,7 +33,7 @@ requires-python = ">=3.10"
dependencies = [
"numpy",
"scipy",
"pandas>=0.24.0",
"pandas>=0.24.0,<3",
"networkx>=1.10",
"pycountry",
"country_converter",
Expand Down