Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions .github/workflows/full_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ jobs:

build:
runs-on: ubuntu-latest
# Without this, `uv run` re-syncs the environment from the lockfile and
# silently undoes the pandas version installed below.
env:
UV_NO_SYNC: "1"
strategy:
matrix:
python-version: ["3.12", "3.14"]
Expand All @@ -42,14 +46,16 @@ jobs:

- name: Install pandas 2.x
if: matrix.pandas-version == 'pandas2'
run: uv run pip install "pandas>=2.0,<3.0"
run: uv pip install "pandas>=2.0,<3.0"

- name: Install pandas 3.x
if: matrix.pandas-version == 'pandas3'
run: uv run pip install "pandas>=3.0,<4.0"
run: uv pip install "pandas>=3.0,<4.0"

- name: Show pandas version
run: uv run python -c "import pandas; print(f'pandas {pandas.__version__}')"
- name: Check pandas version
env:
EXPECTED_MAJOR: ${{ matrix.pandas-version == 'pandas3' && '3' || '2' }}
run: uv run python -c "import os, pandas; v = pandas.__version__; print('pandas', v); assert v.split('.')[0] == os.environ['EXPECTED_MAJOR'], v"

- name: Type check
run: just typecheck
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ name = "modelskill"
version = "1.4.0a3"
dependencies = [
"numpy > 1.24.4",
"pandas >= 1.4, < 3.0", # TODO remove upper limit
"pandas >= 2.2",
"mikeio >= 1.2",
"matplotlib",
"xarray",
Expand Down
2 changes: 1 addition & 1 deletion src/modelskill/comparison/_comparison.py
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ def __init__(
else {
# key: ModelResult(value, gtype=self.data.gtype, name=key, x=self.x, y=self.y)
str(key): PointModelResult(self.data[[str(key)]], name=str(key))
for key, value in matched_data.data_vars.items()
for key, value in self.data.data_vars.items()
if value.attrs["kind"] == "model"
}
)
Expand Down
Loading