Skip to content

Commit fbf5134

Browse files
authored
Merge pull request #404 from RoseauTechnologies/test-new
Run tests on dev and free-threaded pythons and fix passing a compiled regex to catalogue filters as it started failing with newer versions of pandas.
2 parents 9cb7b36 + 041321b commit fbf5134

File tree

4 files changed

+775
-624
lines changed

4 files changed

+775
-624
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
strategy:
2929
matrix:
30-
python-version: ["3.11", "3.12", "3.13"] #, "3.13t", "3.14-dev"] # waiting for pyproj support
30+
python-version: ["3.11", "3.12", "3.13", "3.13t", "3.14", "3.14t"]
3131

3232
permissions:
3333
contents: read
@@ -61,10 +61,6 @@ jobs:
6161
uses: astral-sh/setup-uv@v7
6262
with:
6363
enable-cache: true
64-
65-
- name: Set up Python ${{ matrix.python-version }}
66-
uses: actions/setup-python@v6
67-
with:
6864
python-version: ${{ matrix.python-version }}
6965

7066
- name: Install dependencies

doc/Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ og:description: See what's new in the latest release of Roseau Load Flow !
2323

2424
- {gh-pr}`413` Restore bus and layers to the layer control in the interactive map plot. This was broken in version
2525
0.13.0.
26+
- {gh-pr}`404` Fix filtering catalogues using compiled regular expressions with newer versions of pandas.
2627

2728
## Version 0.13.1
2829

roseau/load_flow/utils/mixins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ def _filter_catalogue_str(
305305
"""
306306
vector = pd.Series(strings)
307307
if isinstance(value, re.Pattern):
308-
result = vector.str.fullmatch(value, case=False)
308+
result = vector.str.fullmatch(value.pattern, case=False, flags=value.flags)
309309
else:
310310
try:
311311
result = vector.str.fullmatch(value, case=False) | (vector.str.casefold() == value.casefold())

0 commit comments

Comments
 (0)