diff --git a/pyproject.toml b/pyproject.toml index 8861d969d..f18450187 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,16 +8,17 @@ wheel-exclude = ["**/.mypy_cache**","**/.mypy_cache/**"] [project] name = "modelskill" -version = "1.3.0" +version = "1.3.2" dependencies = [ "numpy > 1.24.4", - "pandas >= 1.4", + "pandas >= 1.4, < 3", "mikeio >= 1.2", "matplotlib", "xarray", "netCDF4", "scipy", "jinja2", # used for skill.style + "pyyaml", # used for from_config() and settings ] authors = [ diff --git a/src/modelskill/metrics.py b/src/modelskill/metrics.py index 3f1dcdaf7..30e4b02bc 100644 --- a/src/modelskill/metrics.py +++ b/src/modelskill/metrics.py @@ -588,7 +588,7 @@ def peak_ratio( time = obs.index # Calculate number of years - dt_int = time[1:].values - time[0:-1].values + dt_int = (time[1:].values - time[0:-1].values).view("int64") dt_int_mode = float(stats.mode(dt_int, keepdims=False)[0]) / 1e9 # in seconds N_years = dt_int_mode / 24 / 3600 / 365.25 * len(time) peak_index, AAP_ = _partial_duration_series( diff --git a/src/modelskill/model/dfsu.py b/src/modelskill/model/dfsu.py index 7ab7cf041..511e829d6 100644 --- a/src/modelskill/model/dfsu.py +++ b/src/modelskill/model/dfsu.py @@ -219,7 +219,7 @@ def _extract_point( # TODO not sure why we rename here assert self.name is not None - ds_model.rename({ds_model.items[0].name: self.name}, inplace=True) + ds_model = ds_model.rename({ds_model.items[0].name: self.name}) return PointModelResult( data=ds_model, @@ -268,7 +268,7 @@ def _extract_track( if isinstance(self.data, mikeio.DataArray): ds_model = self.data.extract_track(track=track, method=method) - ds_model.rename({self.data.name: self.name}, inplace=True) + ds_model = ds_model.rename({self.data.name: self.name}) aux_items = None else: if isinstance(self.data, mikeio.dfsu.Dfsu2DH): @@ -279,7 +279,7 @@ def _extract_track( ds_model = self.data[self.sel_items.all].extract_track( track=track, method=method ) - ds_model.rename({self.sel_items.values: self.name}, inplace=True) + ds_model = ds_model.rename({self.sel_items.values: self.name}) aux_items = self.sel_items.aux item_names = [i.name for i in ds_model.items] diff --git a/tests/model/test_dfsu.py b/tests/model/test_dfsu.py index 6d9efa53f..e9b5809b0 100644 --- a/tests/model/test_dfsu.py +++ b/tests/model/test_dfsu.py @@ -70,9 +70,6 @@ def test_dfsu_repr(hd_oresund_2d): def test_dfsu_properties(hd_oresund_2d): mr = ms.model_result(hd_oresund_2d, name="Oresund2d", item="Surface elevation") - # TODO Not sure this assert is useful - assert mr.data.geometry.is_2d - # Note != name of item assert mr.quantity.name == "Surface Elevation" assert mr.quantity.unit == "m" diff --git a/tests/test_combine_comparers.py b/tests/test_combine_comparers.py index 97735ece1..a9a7101a9 100644 --- a/tests/test_combine_comparers.py +++ b/tests/test_combine_comparers.py @@ -65,11 +65,9 @@ def test_merge(o123, mrmike, mrmike2): assert cc12b.score() == cc12.score() assert cc12b.n_points == cc12.n_points - # deprecated - with pytest.warns(FutureWarning, match="deprecated"): - cc12c = cc1 + cc2 - assert cc12c.score() == cc12.score() - assert cc12c.n_points == cc12.n_points + cc12c = cc1 + cc2 + assert cc12c.score() == cc12.score() + assert cc12c.n_points == cc12.n_points def test_merge_models_different_time(o123, mrmike, mr2days): diff --git a/tests/test_match.py b/tests/test_match.py index 45b12e7ae..2dbddfa35 100644 --- a/tests/test_match.py +++ b/tests/test_match.py @@ -8,7 +8,6 @@ from modelskill.comparison._comparison import ItemSelection from modelskill.model.dfsu import DfsuModelResult - @pytest.fixture def o1(): fn = "tests/testdata/SW/HKNA_Hm0.dfs0"