From c9c557f15a3e336131b78f2a32a57fd50b837c98 Mon Sep 17 00:00:00 2001 From: Philip Date: Sun, 8 Jan 2023 23:50:05 -0500 Subject: [PATCH 1/5] updated tests --- pandas/tests/generic/test_generic.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pandas/tests/generic/test_generic.py b/pandas/tests/generic/test_generic.py index 4e175d18c816a..8bfff6d17ad01 100644 --- a/pandas/tests/generic/test_generic.py +++ b/pandas/tests/generic/test_generic.py @@ -50,7 +50,7 @@ def construct(box, shape, value=None, dtype=None, **kwargs): return box(arr, dtype=dtype, **kwargs) -class Generic: +class TestGeneric: @pytest.mark.parametrize( "func", [ @@ -66,7 +66,7 @@ def test_rename(self, frame_or_series, func): for axis in frame_or_series._AXIS_ORDERS: kwargs = {axis: idx} - obj = construct(4, **kwargs) + obj = construct(frame_or_series, 4, **kwargs) # rename a single axis result = obj.rename(**{axis: func}) @@ -83,21 +83,21 @@ def test_get_numeric_data(self, frame_or_series): } # get the numeric data - o = construct(n, **kwargs) + o = construct(frame_or_series, n, **kwargs) result = o._get_numeric_data() tm.assert_equal(result, o) # non-inclusion result = o._get_bool_data() - expected = construct(n, value="empty", **kwargs) + expected = construct(frame_or_series, n, value="empty", **kwargs) if isinstance(o, DataFrame): # preserve columns dtype expected.columns = o.columns[:0] - tm.assert_equal(result, expected) + tm.assert_equal(result.reset_index(drop=True), expected) # get the bool data arr = np.array([True, True, False, True]) - o = construct(n, value=arr, **kwargs) + o = construct(frame_or_series, n, value=arr, **kwargs) result = o._get_numeric_data() tm.assert_equal(result, o) @@ -160,7 +160,7 @@ def f(dtype): msg = ( "compound dtypes are not implemented " - f"in the {frame_or_series.__name__} frame_or_series" + f"in the {frame_or_series.__name__} constructor" ) with pytest.raises(NotImplementedError, match=msg): @@ -257,7 +257,7 @@ def test_api_compat(self, func, frame_or_series): # GH 12021 # compat for __name__, __qualname__ - obj = (frame_or_series, 5) + obj = construct(frame_or_series, 5) f = getattr(obj, func) assert f.__name__ == func assert f.__qualname__.endswith(func) From 7b67f8fd33e112f13206743d705438d1fccb8b18 Mon Sep 17 00:00:00 2001 From: Philip Date: Mon, 9 Jan 2023 23:48:58 -0500 Subject: [PATCH 2/5] updated assert_metadata_equivalent --- pandas/_testing/asserters.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandas/_testing/asserters.py b/pandas/_testing/asserters.py index 276d3019e126f..7044faedb33f9 100644 --- a/pandas/_testing/asserters.py +++ b/pandas/_testing/asserters.py @@ -1340,7 +1340,9 @@ def assert_indexing_slices_equivalent(ser: Series, l_slc: slice, i_slc: slice) - assert_series_equal(ser[l_slc], expected) -def assert_metadata_equivalent(left, right) -> None: +def assert_metadata_equivalent( + left: DataFrame | Series, right: DataFrame | Series = None +) -> None: """ Check that ._metadata attributes are equivalent. """ From 85d90abc6a84fcdc4bdd1a9985b1fe5da00154e0 Mon Sep 17 00:00:00 2001 From: Philip Date: Tue, 10 Jan 2023 14:05:52 -0500 Subject: [PATCH 3/5] updated assert_metadata_equivalent and deleted exclude in YAML check-test-naming --- .pre-commit-config.yaml | 3 --- pandas/_testing/asserters.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 82043f79643e4..b6b3b9140a101 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -459,6 +459,3 @@ repos: types: [python] files: ^pandas/tests language: python - exclude: | - (?x) - ^pandas/tests/generic/test_generic.py # GH50380 diff --git a/pandas/_testing/asserters.py b/pandas/_testing/asserters.py index 7044faedb33f9..e86b2f5aea6d0 100644 --- a/pandas/_testing/asserters.py +++ b/pandas/_testing/asserters.py @@ -1341,7 +1341,7 @@ def assert_indexing_slices_equivalent(ser: Series, l_slc: slice, i_slc: slice) - def assert_metadata_equivalent( - left: DataFrame | Series, right: DataFrame | Series = None + left: DataFrame | Series, right: DataFrame | Series | None = None ) -> None: """ Check that ._metadata attributes are equivalent. From 6bb8a20515e16d38203fdfd61a213b1cb6814560 Mon Sep 17 00:00:00 2001 From: Philip Date: Thu, 19 Jan 2023 12:49:09 -0500 Subject: [PATCH 4/5] added comment --- pandas/tests/generic/test_generic.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/generic/test_generic.py b/pandas/tests/generic/test_generic.py index 8bfff6d17ad01..f4fefc2c323c9 100644 --- a/pandas/tests/generic/test_generic.py +++ b/pandas/tests/generic/test_generic.py @@ -88,6 +88,7 @@ def test_get_numeric_data(self, frame_or_series): tm.assert_equal(result, o) # non-inclusion + # https://github.com/pandas-dev/pandas/issues/50862 result = o._get_bool_data() expected = construct(frame_or_series, n, value="empty", **kwargs) if isinstance(o, DataFrame): From f9969a748d9ba9cc02336beffcb16251938d6e23 Mon Sep 17 00:00:00 2001 From: Marco Edward Gorelli <33491632+MarcoGorelli@users.noreply.github.com> Date: Thu, 19 Jan 2023 18:51:56 +0000 Subject: [PATCH 5/5] move comment --- pandas/tests/generic/test_generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/generic/test_generic.py b/pandas/tests/generic/test_generic.py index f4fefc2c323c9..429dd9181ad50 100644 --- a/pandas/tests/generic/test_generic.py +++ b/pandas/tests/generic/test_generic.py @@ -88,12 +88,12 @@ def test_get_numeric_data(self, frame_or_series): tm.assert_equal(result, o) # non-inclusion - # https://github.com/pandas-dev/pandas/issues/50862 result = o._get_bool_data() expected = construct(frame_or_series, n, value="empty", **kwargs) if isinstance(o, DataFrame): # preserve columns dtype expected.columns = o.columns[:0] + # https://github.com/pandas-dev/pandas/issues/50862 tm.assert_equal(result.reset_index(drop=True), expected) # get the bool data