Skip to content

Commit b5c64dc

Browse files
SaturnFromTitangfyoung
authored andcommitted
Fixed test util imports in pandas/tests/indexes (#29289)
xref: #29272
1 parent a49a587 commit b5c64dc

File tree

9 files changed

+63
-74
lines changed

9 files changed

+63
-74
lines changed

pandas/tests/indexes/datetimes/test_datetime.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import pandas as pd
88
from pandas import DataFrame, DatetimeIndex, Index, Timestamp, date_range, offsets
99
import pandas.util.testing as tm
10-
from pandas.util.testing import assert_almost_equal
1110

1211
randn = np.random.randn
1312

@@ -262,7 +261,7 @@ def test_isin(self):
262261
result = index.isin(list(index))
263262
assert result.all()
264263

265-
assert_almost_equal(
264+
tm.assert_almost_equal(
266265
index.isin([index[2], 5]), np.array([False, False, True, False])
267266
)
268267

pandas/tests/indexes/datetimes/test_tools.py

+27-28
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
)
3232
from pandas.core.arrays import DatetimeArray
3333
from pandas.core.tools import datetimes as tools
34-
from pandas.util import testing as tm
35-
from pandas.util.testing import assert_series_equal
34+
import pandas.util.testing as tm
3635

3736

3837
class TestTimeConversionFormats:
@@ -55,7 +54,7 @@ def test_to_datetime_format(self, cache):
5554
expected = expecteds[i]
5655

5756
if isinstance(expected, Series):
58-
assert_series_equal(result, Series(expected))
57+
tm.assert_series_equal(result, Series(expected))
5958
elif isinstance(expected, Timestamp):
6059
assert result == expected
6160
else:
@@ -67,10 +66,10 @@ def test_to_datetime_format_YYYYMMDD(self, cache):
6766
expected = Series([Timestamp(x) for x in s.apply(str)])
6867

6968
result = to_datetime(s, format="%Y%m%d", cache=cache)
70-
assert_series_equal(result, expected)
69+
tm.assert_series_equal(result, expected)
7170

7271
result = to_datetime(s.apply(str), format="%Y%m%d", cache=cache)
73-
assert_series_equal(result, expected)
72+
tm.assert_series_equal(result, expected)
7473

7574
# with NaT
7675
expected = Series(
@@ -80,13 +79,13 @@ def test_to_datetime_format_YYYYMMDD(self, cache):
8079
s[2] = np.nan
8180

8281
result = to_datetime(s, format="%Y%m%d", cache=cache)
83-
assert_series_equal(result, expected)
82+
tm.assert_series_equal(result, expected)
8483

8584
# string with NaT
8685
s = s.apply(str)
8786
s[2] = "nat"
8887
result = to_datetime(s, format="%Y%m%d", cache=cache)
89-
assert_series_equal(result, expected)
88+
tm.assert_series_equal(result, expected)
9089

9190
# coercion
9291
# GH 7930
@@ -131,7 +130,7 @@ def test_to_datetime_format_YYYYMMDD_overflow(self, input_s, expected):
131130
# GH 25512
132131
# format='%Y%m%d', errors='coerce'
133132
result = pd.to_datetime(input_s, format="%Y%m%d", errors="coerce")
134-
assert_series_equal(result, expected)
133+
tm.assert_series_equal(result, expected)
135134

136135
@pytest.mark.parametrize("cache", [True, False])
137136
def test_to_datetime_format_integer(self, cache):
@@ -140,13 +139,13 @@ def test_to_datetime_format_integer(self, cache):
140139
expected = Series([Timestamp(x) for x in s.apply(str)])
141140

142141
result = to_datetime(s, format="%Y", cache=cache)
143-
assert_series_equal(result, expected)
142+
tm.assert_series_equal(result, expected)
144143

145144
s = Series([200001, 200105, 200206])
146145
expected = Series([Timestamp(x[:4] + "-" + x[4:]) for x in s.apply(str)])
147146

148147
result = to_datetime(s, format="%Y%m", cache=cache)
149-
assert_series_equal(result, expected)
148+
tm.assert_series_equal(result, expected)
150149

151150
@pytest.mark.parametrize(
152151
"int_date, expected",
@@ -216,7 +215,7 @@ def test_to_datetime_with_non_exact(self, cache):
216215
expected = to_datetime(
217216
s.str.extract(r"(\d+\w+\d+)", expand=False), format="%d%b%y", cache=cache
218217
)
219-
assert_series_equal(result, expected)
218+
tm.assert_series_equal(result, expected)
220219

221220
@pytest.mark.parametrize("cache", [True, False])
222221
def test_parse_nanoseconds_with_formula(self, cache):
@@ -1204,11 +1203,11 @@ def test_dataframe(self, cache):
12041203
expected = Series(
12051204
[Timestamp("20150204 00:00:00"), Timestamp("20160305 00:0:00")]
12061205
)
1207-
assert_series_equal(result, expected)
1206+
tm.assert_series_equal(result, expected)
12081207

12091208
# dict-like
12101209
result = to_datetime(df[["year", "month", "day"]].to_dict(), cache=cache)
1211-
assert_series_equal(result, expected)
1210+
tm.assert_series_equal(result, expected)
12121211

12131212
# dict but with constructable
12141213
df2 = df[["year", "month", "day"]].to_dict()
@@ -1217,7 +1216,7 @@ def test_dataframe(self, cache):
12171216
expected2 = Series(
12181217
[Timestamp("20150204 00:00:00"), Timestamp("20160205 00:0:00")]
12191218
)
1220-
assert_series_equal(result, expected2)
1219+
tm.assert_series_equal(result, expected2)
12211220

12221221
# unit mappings
12231222
units = [
@@ -1244,7 +1243,7 @@ def test_dataframe(self, cache):
12441243
expected = Series(
12451244
[Timestamp("20150204 06:58:10"), Timestamp("20160305 07:59:11")]
12461245
)
1247-
assert_series_equal(result, expected)
1246+
tm.assert_series_equal(result, expected)
12481247

12491248
d = {
12501249
"year": "year",
@@ -1265,11 +1264,11 @@ def test_dataframe(self, cache):
12651264
Timestamp("20160305 07:59:11.001002003"),
12661265
]
12671266
)
1268-
assert_series_equal(result, expected)
1267+
tm.assert_series_equal(result, expected)
12691268

12701269
# coerce back to int
12711270
result = to_datetime(df.astype(str), cache=cache)
1272-
assert_series_equal(result, expected)
1271+
tm.assert_series_equal(result, expected)
12731272

12741273
# passing coerce
12751274
df2 = DataFrame({"year": [2015, 2016], "month": [2, 20], "day": [4, 5]})
@@ -1282,7 +1281,7 @@ def test_dataframe(self, cache):
12821281
to_datetime(df2, cache=cache)
12831282
result = to_datetime(df2, errors="coerce", cache=cache)
12841283
expected = Series([Timestamp("20150204 00:00:00"), NaT])
1285-
assert_series_equal(result, expected)
1284+
tm.assert_series_equal(result, expected)
12861285

12871286
# extra columns
12881287
msg = "extra keys have been passed to the datetime assemblage: " r"\[foo\]"
@@ -1330,7 +1329,7 @@ def test_dataframe_dtypes(self, cache):
13301329
expected = Series(
13311330
[Timestamp("20150204 00:00:00"), Timestamp("20160305 00:00:00")]
13321331
)
1333-
assert_series_equal(result, expected)
1332+
tm.assert_series_equal(result, expected)
13341333

13351334
# mixed dtypes
13361335
df["month"] = df["month"].astype("int8")
@@ -1339,7 +1338,7 @@ def test_dataframe_dtypes(self, cache):
13391338
expected = Series(
13401339
[Timestamp("20150204 00:00:00"), Timestamp("20160305 00:00:00")]
13411340
)
1342-
assert_series_equal(result, expected)
1341+
tm.assert_series_equal(result, expected)
13431342

13441343
# float
13451344
df = DataFrame({"year": [2000, 2001], "month": [1.5, 1], "day": [1, 1]})
@@ -1434,7 +1433,7 @@ def test_to_datetime_with_apply(self, cache):
14341433
td = Series(["May 04", "Jun 02", "Dec 11"], index=[1, 2, 3])
14351434
expected = pd.to_datetime(td, format="%b %y", cache=cache)
14361435
result = td.apply(pd.to_datetime, format="%b %y", cache=cache)
1437-
assert_series_equal(result, expected)
1436+
tm.assert_series_equal(result, expected)
14381437

14391438
td = pd.Series(["May 04", "Jun 02", ""], index=[1, 2, 3])
14401439
msg = r"time data '' does not match format '%b %y' \(match\)"
@@ -1447,7 +1446,7 @@ def test_to_datetime_with_apply(self, cache):
14471446
result = td.apply(
14481447
lambda x: pd.to_datetime(x, format="%b %y", errors="coerce", cache=cache)
14491448
)
1450-
assert_series_equal(result, expected)
1449+
tm.assert_series_equal(result, expected)
14511450

14521451
@pytest.mark.parametrize("cache", [True, False])
14531452
def test_to_datetime_types(self, cache):
@@ -1584,10 +1583,10 @@ def test_string_na_nat_conversion(self, cache):
15841583
else:
15851584
expected[i] = to_datetime(x, cache=cache)
15861585

1587-
assert_series_equal(result, expected, check_names=False)
1586+
tm.assert_series_equal(result, expected, check_names=False)
15881587
assert result.name == "foo"
15891588

1590-
assert_series_equal(dresult, expected, check_names=False)
1589+
tm.assert_series_equal(dresult, expected, check_names=False)
15911590
assert dresult.name == "foo"
15921591

15931592
@pytest.mark.parametrize(
@@ -2158,20 +2157,20 @@ def test_to_basic(self, julian_dates):
21582157
expected = Series(
21592158
pd.to_datetime(julian_dates - pd.Timestamp(0).to_julian_date(), unit="D")
21602159
)
2161-
assert_series_equal(result, expected)
2160+
tm.assert_series_equal(result, expected)
21622161

21632162
result = Series(pd.to_datetime([0, 1, 2], unit="D", origin="unix"))
21642163
expected = Series(
21652164
[Timestamp("1970-01-01"), Timestamp("1970-01-02"), Timestamp("1970-01-03")]
21662165
)
2167-
assert_series_equal(result, expected)
2166+
tm.assert_series_equal(result, expected)
21682167

21692168
# default
21702169
result = Series(pd.to_datetime([0, 1, 2], unit="D"))
21712170
expected = Series(
21722171
[Timestamp("1970-01-01"), Timestamp("1970-01-02"), Timestamp("1970-01-03")]
21732172
)
2174-
assert_series_equal(result, expected)
2173+
tm.assert_series_equal(result, expected)
21752174

21762175
def test_julian_round_trip(self):
21772176
result = pd.to_datetime(2456658, origin="julian", unit="D")
@@ -2204,7 +2203,7 @@ def test_epoch(self, units, epochs, epoch_1960, units_from_epochs):
22042203
)
22052204

22062205
result = Series(pd.to_datetime(units_from_epochs, unit=units, origin=epochs))
2207-
assert_series_equal(result, expected)
2206+
tm.assert_series_equal(result, expected)
22082207

22092208
@pytest.mark.parametrize(
22102209
"origin, exc",

pandas/tests/indexes/multi/test_astype.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
from pandas.core.dtypes.dtypes import CategoricalDtype
55

6-
from pandas.util.testing import assert_copy
6+
import pandas.util.testing as tm
77

88

99
def test_astype(idx):
1010
expected = idx.copy()
1111
actual = idx.astype("O")
12-
assert_copy(actual.levels, expected.levels)
13-
assert_copy(actual.codes, expected.codes)
12+
tm.assert_copy(actual.levels, expected.levels)
13+
tm.assert_copy(actual.codes, expected.codes)
1414
assert actual.names == list(expected.names)
1515

1616
with pytest.raises(TypeError, match="^Setting.*dtype.*object"):

pandas/tests/indexes/multi/test_indexing.py

+8-9
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
)
1515
from pandas.core.indexes.base import InvalidIndexError
1616
import pandas.util.testing as tm
17-
from pandas.util.testing import assert_almost_equal
1817

1918

2019
def test_slice_locs_partial(idx):
@@ -145,32 +144,32 @@ def test_get_indexer():
145144
idx2 = index[[1, 3, 5]]
146145

147146
r1 = idx1.get_indexer(idx2)
148-
assert_almost_equal(r1, np.array([1, 3, -1], dtype=np.intp))
147+
tm.assert_almost_equal(r1, np.array([1, 3, -1], dtype=np.intp))
149148

150149
r1 = idx2.get_indexer(idx1, method="pad")
151150
e1 = np.array([-1, 0, 0, 1, 1], dtype=np.intp)
152-
assert_almost_equal(r1, e1)
151+
tm.assert_almost_equal(r1, e1)
153152

154153
r2 = idx2.get_indexer(idx1[::-1], method="pad")
155-
assert_almost_equal(r2, e1[::-1])
154+
tm.assert_almost_equal(r2, e1[::-1])
156155

157156
rffill1 = idx2.get_indexer(idx1, method="ffill")
158-
assert_almost_equal(r1, rffill1)
157+
tm.assert_almost_equal(r1, rffill1)
159158

160159
r1 = idx2.get_indexer(idx1, method="backfill")
161160
e1 = np.array([0, 0, 1, 1, 2], dtype=np.intp)
162-
assert_almost_equal(r1, e1)
161+
tm.assert_almost_equal(r1, e1)
163162

164163
r2 = idx2.get_indexer(idx1[::-1], method="backfill")
165-
assert_almost_equal(r2, e1[::-1])
164+
tm.assert_almost_equal(r2, e1[::-1])
166165

167166
rbfill1 = idx2.get_indexer(idx1, method="bfill")
168-
assert_almost_equal(r1, rbfill1)
167+
tm.assert_almost_equal(r1, rbfill1)
169168

170169
# pass non-MultiIndex
171170
r1 = idx1.get_indexer(idx2.values)
172171
rexp1 = idx1.get_indexer(idx2)
173-
assert_almost_equal(r1, rexp1)
172+
tm.assert_almost_equal(r1, rexp1)
174173

175174
r1 = idx1.get_indexer([1, 2, 3])
176175
assert (r1 == [-1, -1, -1]).all()

pandas/tests/indexes/test_base.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
from pandas.tests.indexes.common import Base
4444
from pandas.tests.indexes.conftest import indices_dict
4545
import pandas.util.testing as tm
46-
from pandas.util.testing import assert_almost_equal
4746

4847

4948
class TestIndex(Base):
@@ -1452,7 +1451,7 @@ def test_get_indexer(self):
14521451

14531452
r1 = index1.get_indexer(index2)
14541453
e1 = np.array([1, 3, -1], dtype=np.intp)
1455-
assert_almost_equal(r1, e1)
1454+
tm.assert_almost_equal(r1, e1)
14561455

14571456
@pytest.mark.parametrize("reverse", [True, False])
14581457
@pytest.mark.parametrize(
@@ -1473,7 +1472,7 @@ def test_get_indexer_methods(self, reverse, expected, method):
14731472
expected = expected[::-1]
14741473

14751474
result = index2.get_indexer(index1, method=method)
1476-
assert_almost_equal(result, expected)
1475+
tm.assert_almost_equal(result, expected)
14771476

14781477
def test_get_indexer_invalid(self):
14791478
# GH10411
@@ -1921,7 +1920,7 @@ def test_get_value(self, index):
19211920
values = np.random.randn(100)
19221921
value = index[67]
19231922

1924-
assert_almost_equal(index.get_value(values, value), values[67])
1923+
tm.assert_almost_equal(index.get_value(values, value), values[67])
19251924

19261925
@pytest.mark.parametrize("values", [["foo", "bar", "quux"], {"foo", "bar", "quux"}])
19271926
@pytest.mark.parametrize(

pandas/tests/indexes/test_category.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from pandas import Categorical, IntervalIndex
1212
from pandas.core.indexes.api import CategoricalIndex, Index
1313
import pandas.util.testing as tm
14-
from pandas.util.testing import assert_almost_equal
1514

1615
from .common import Base
1716

@@ -678,7 +677,7 @@ def test_get_indexer(self):
678677

679678
for indexer in [idx2, list("abf"), Index(list("abf"))]:
680679
r1 = idx1.get_indexer(idx2)
681-
assert_almost_equal(r1, np.array([0, 1, 2, -1], dtype=np.intp))
680+
tm.assert_almost_equal(r1, np.array([0, 1, 2, -1], dtype=np.intp))
682681

683682
msg = (
684683
"method='pad' and method='backfill' not implemented yet for"

0 commit comments

Comments
 (0)