Skip to content

Commit c6e596d

Browse files
authored
Disable check_freq in testing util. (#2112)
We'd disable `check_freq` for checking the `freq` in `DatetimeIndex` because so far we don't provide `freq` in `DatetimeIndex`.
1 parent 583e03d commit c6e596d

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

databricks/koalas/testing/utils.py

+13
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import unittest
2121
import warnings
2222
from contextlib import contextmanager
23+
from distutils.version import LooseVersion
2324

2425
import pandas as pd
2526
from pandas.api.types import is_list_like
@@ -124,12 +125,18 @@ def tearDownClass(cls):
124125
def assertPandasEqual(self, left, right, check_exact=True):
125126
if isinstance(left, pd.DataFrame) and isinstance(right, pd.DataFrame):
126127
try:
128+
if LooseVersion(pd.__version__) >= LooseVersion("1.1"):
129+
kwargs = dict(check_freq=False)
130+
else:
131+
kwargs = dict()
132+
127133
assert_frame_equal(
128134
left,
129135
right,
130136
check_index_type=("equiv" if len(left.index) > 0 else False),
131137
check_column_type=("equiv" if len(left.columns) > 0 else False),
132138
check_exact=check_exact,
139+
**kwargs
133140
)
134141
except AssertionError as e:
135142
msg = (
@@ -140,11 +147,17 @@ def assertPandasEqual(self, left, right, check_exact=True):
140147
raise AssertionError(msg) from e
141148
elif isinstance(left, pd.Series) and isinstance(right, pd.Series):
142149
try:
150+
if LooseVersion(pd.__version__) >= LooseVersion("1.1"):
151+
kwargs = dict(check_freq=False)
152+
else:
153+
kwargs = dict()
154+
143155
assert_series_equal(
144156
left,
145157
right,
146158
check_index_type=("equiv" if len(left.index) > 0 else False),
147159
check_exact=check_exact,
160+
**kwargs
148161
)
149162
except AssertionError as e:
150163
msg = (

databricks/koalas/tests/test_dataframe.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -5428,9 +5428,8 @@ def test_between_time(self):
54285428
pdf = pd.DataFrame({"A": [1, 2, 3, 4]}, index=idx)
54295429
kdf = ks.from_pandas(pdf)
54305430
self.assert_eq(
5431-
pdf.between_time("0:15", "0:45"),
5431+
pdf.between_time("0:15", "0:45").sort_index(),
54325432
kdf.between_time("0:15", "0:45").sort_index(),
5433-
almost=True,
54345433
)
54355434

54365435
with self.assertRaisesRegex(

0 commit comments

Comments
 (0)