Skip to content

fixed mypy errors in mypy-pandas.tests.extension.decimal.test_decimal #31730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
using classmethods now
  • Loading branch information
SaturnFromTitan committed Feb 8, 2020
commit a764fd22adbc4939704b714b80a61e4ac9a70c2a
15 changes: 10 additions & 5 deletions pandas/tests/extension/base/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@


class BaseExtensionTests:
# can't use staticmethod() as this confuses mypy
def assert_equal(self, left, right, **kwargs):
# classmethod and different signature is needed
# to make inheritance compliant with mypy
@classmethod
def assert_equal(cls, left, right, **kwargs):
return tm.assert_equal(left, right, **kwargs)

def assert_series_equal(self, left, right, *args, **kwargs):
@classmethod
def assert_series_equal(cls, left, right, *args, **kwargs):
return tm.assert_series_equal(left, right, *args, **kwargs)

def assert_frame_equal(self, left, right, *args, **kwargs):
@classmethod
def assert_frame_equal(cls, left, right, *args, **kwargs):
return tm.assert_frame_equal(left, right, *args, **kwargs)

def assert_extension_array_equal(self, left, right, *args, **kwargs):
@classmethod
def assert_extension_array_equal(cls, left, right, *args, **kwargs):
return tm.assert_extension_array_equal(left, right, *args, **kwargs)
8 changes: 5 additions & 3 deletions pandas/tests/extension/decimal/test_decimal.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ def data_for_grouping():


class BaseDecimal:
def assert_series_equal(self, left, right, *args, **kwargs):
@classmethod
def assert_series_equal(cls, left, right, *args, **kwargs):
def convert(x):
# need to convert array([Decimal(NaN)], dtype='object') to np.NaN
# because Series[object].isnan doesn't recognize decimal(NaN) as
Expand All @@ -88,7 +89,8 @@ def convert(x):
tm.assert_series_equal(left_na, right_na)
return tm.assert_series_equal(left[~left_na], right[~right_na], *args, **kwargs)

def assert_frame_equal(self, left, right, *args, **kwargs):
@classmethod
def assert_frame_equal(cls, left, right, *args, **kwargs):
# TODO(EA): select_dtypes
tm.assert_index_equal(
left.columns,
Expand All @@ -103,7 +105,7 @@ def assert_frame_equal(self, left, right, *args, **kwargs):
decimals = (left.dtypes == "decimal").index

for col in decimals:
self.assert_series_equal(left[col], right[col], *args, **kwargs)
cls.assert_series_equal(left[col], right[col], *args, **kwargs)

left = left.drop(columns=decimals)
right = right.drop(columns=decimals)
Expand Down