From 585ba0418c85df60d1e2001bfae63747c0a3a15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20W=C3=B6rtwein?= Date: Thu, 10 Nov 2022 15:58:59 -0500 Subject: [PATCH 1/2] CI: fix tests for pandas nightly --- pyproject.toml | 4 ++-- tests/test_resampler.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a7aaf932a..e1fc29648 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ python = ">=3.8,<3.11" types-pytz = ">= 2022.1.1" [tool.poetry.dev-dependencies] -mypy = "==0.990" +mypy = "0.990" pyarrow = ">=9.0.0" pytest = ">=7.1.2" pyright = ">=1.1.278" @@ -42,7 +42,7 @@ poethepoet = "0.16.0" loguru = ">=0.6.0" pandas = "1.5.1" typing-extensions = ">=4.2.0" -matplotlib = "~=3.5.0" +matplotlib = ">=3.5.1" pre-commit = ">=2.19.0" black = ">=22.8.0" isort = ">=5.10.1" diff --git a/tests/test_resampler.py b/tests/test_resampler.py index 3d9dc3538..4c30ffc49 100644 --- a/tests/test_resampler.py +++ b/tests/test_resampler.py @@ -298,8 +298,7 @@ def s2scalar(val: Series) -> float: check(S.resample("m").aggregate(np.sum), Series) check(S.resample("m").aggregate("sum"), Series) - with pytest.warns(FutureWarning, match="Not prepending group keys"): - check(S.resample("m").aggregate(s2series), Series) + check(S.resample("m").aggregate(s2series), Series) check(S.resample("m").aggregate(s2scalar), Series) check(S.resample("m").aggregate([np.mean]), DataFrame) check(S.resample("m").aggregate(["sum", np.mean]), DataFrame) @@ -319,8 +318,7 @@ def df2scalar(val: DataFrame) -> float: check(DF.resample("m").aggregate(np.sum), DataFrame) check(DF.resample("m").aggregate("sum"), DataFrame) - with pytest.warns(FutureWarning, match="Not prepending group keys"): - check(DF.resample("m").aggregate(df2frame), DataFrame) + check(DF.resample("m").aggregate(df2frame), DataFrame) check(DF.resample("m").aggregate(df2series), DataFrame) check(DF.resample("m").aggregate(df2scalar), DataFrame) check(DF.resample("m").aggregate([np.mean]), DataFrame) From 1cf02caddce3531fbee56bc7bda10cc577696798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20W=C3=B6rtwein?= Date: Thu, 10 Nov 2022 16:13:55 -0500 Subject: [PATCH 2/2] fix tests --- tests/test_resampler.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/test_resampler.py b/tests/test_resampler.py index 4c30ffc49..c4287d1a9 100644 --- a/tests/test_resampler.py +++ b/tests/test_resampler.py @@ -16,12 +16,14 @@ ) from pandas.core.groupby.generic import SeriesGroupBy from pandas.core.resample import Resampler -import pytest from typing_extensions import assert_type from pandas._typing import Scalar -from tests import check +from tests import ( + check, + pytest_warns_bounded, +) DR = date_range("1999-1-1", periods=365, freq="D") DF_ = DataFrame(np.random.standard_normal((365, 1)), index=DR) @@ -298,7 +300,10 @@ def s2scalar(val: Series) -> float: check(S.resample("m").aggregate(np.sum), Series) check(S.resample("m").aggregate("sum"), Series) - check(S.resample("m").aggregate(s2series), Series) + with pytest_warns_bounded( + FutureWarning, match="Not prepending group keys", upper="1.5.99" + ): + check(S.resample("m").aggregate(s2series), Series) check(S.resample("m").aggregate(s2scalar), Series) check(S.resample("m").aggregate([np.mean]), DataFrame) check(S.resample("m").aggregate(["sum", np.mean]), DataFrame) @@ -318,7 +323,10 @@ def df2scalar(val: DataFrame) -> float: check(DF.resample("m").aggregate(np.sum), DataFrame) check(DF.resample("m").aggregate("sum"), DataFrame) - check(DF.resample("m").aggregate(df2frame), DataFrame) + with pytest_warns_bounded( + FutureWarning, match="Not prepending group keys", upper="1.5.99" + ): + check(DF.resample("m").aggregate(df2frame), DataFrame) check(DF.resample("m").aggregate(df2series), DataFrame) check(DF.resample("m").aggregate(df2scalar), DataFrame) check(DF.resample("m").aggregate([np.mean]), DataFrame)