Skip to content

Commit 42084f4

Browse files
authored
CLN: inconsistent namespace usage in tests.indexes (#38076)
1 parent 0787b53 commit 42084f4

20 files changed

+151
-152
lines changed

pandas/tests/indexes/datetimes/test_astype.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def test_astype_object(self):
172172

173173
@pytest.mark.parametrize("tz", [None, "Asia/Tokyo"])
174174
def test_astype_object_tz(self, tz):
175-
idx = pd.date_range(start="2013-01-01", periods=4, freq="M", name="idx", tz=tz)
175+
idx = date_range(start="2013-01-01", periods=4, freq="M", name="idx", tz=tz)
176176
expected_list = [
177177
Timestamp("2013-01-31", tz=tz),
178178
Timestamp("2013-02-28", tz=tz),
@@ -288,7 +288,7 @@ def test_dti_astype_period(self):
288288
class TestAstype:
289289
@pytest.mark.parametrize("tz", [None, "US/Central"])
290290
def test_astype_category(self, tz):
291-
obj = pd.date_range("2000", periods=2, tz=tz, name="idx")
291+
obj = date_range("2000", periods=2, tz=tz, name="idx")
292292
result = obj.astype("category")
293293
expected = pd.CategoricalIndex(
294294
[Timestamp("2000-01-01", tz=tz), Timestamp("2000-01-02", tz=tz)],
@@ -302,7 +302,7 @@ def test_astype_category(self, tz):
302302

303303
@pytest.mark.parametrize("tz", [None, "US/Central"])
304304
def test_astype_array_fallback(self, tz):
305-
obj = pd.date_range("2000", periods=2, tz=tz, name="idx")
305+
obj = date_range("2000", periods=2, tz=tz, name="idx")
306306
result = obj.astype(bool)
307307
expected = Index(np.array([True, True]), name="idx")
308308
tm.assert_index_equal(result, expected)

pandas/tests/indexes/datetimes/test_constructors.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_freq_validation_with_nat(self, dt_cls):
3535
@pytest.mark.parametrize(
3636
"index",
3737
[
38-
pd.date_range("2016-01-01", periods=5, tz="US/Pacific"),
38+
date_range("2016-01-01", periods=5, tz="US/Pacific"),
3939
pd.timedelta_range("1 Day", periods=5),
4040
],
4141
)
@@ -103,14 +103,14 @@ def test_construction_caching(self):
103103

104104
df = pd.DataFrame(
105105
{
106-
"dt": pd.date_range("20130101", periods=3),
107-
"dttz": pd.date_range("20130101", periods=3, tz="US/Eastern"),
106+
"dt": date_range("20130101", periods=3),
107+
"dttz": date_range("20130101", periods=3, tz="US/Eastern"),
108108
"dt_with_null": [
109109
Timestamp("20130101"),
110110
pd.NaT,
111111
Timestamp("20130103"),
112112
],
113-
"dtns": pd.date_range("20130101", periods=3, freq="ns"),
113+
"dtns": date_range("20130101", periods=3, freq="ns"),
114114
}
115115
)
116116
assert df.dttz.dtype.tz.zone == "US/Eastern"
@@ -121,7 +121,7 @@ def test_construction_caching(self):
121121
)
122122
def test_construction_with_alt(self, kwargs, tz_aware_fixture):
123123
tz = tz_aware_fixture
124-
i = pd.date_range("20130101", periods=5, freq="H", tz=tz)
124+
i = date_range("20130101", periods=5, freq="H", tz=tz)
125125
kwargs = {key: attrgetter(val)(i) for key, val in kwargs.items()}
126126
result = DatetimeIndex(i, **kwargs)
127127
tm.assert_index_equal(i, result)
@@ -132,7 +132,7 @@ def test_construction_with_alt(self, kwargs, tz_aware_fixture):
132132
)
133133
def test_construction_with_alt_tz_localize(self, kwargs, tz_aware_fixture):
134134
tz = tz_aware_fixture
135-
i = pd.date_range("20130101", periods=5, freq="H", tz=tz)
135+
i = date_range("20130101", periods=5, freq="H", tz=tz)
136136
i = i._with_freq(None)
137137
kwargs = {key: attrgetter(val)(i) for key, val in kwargs.items()}
138138

@@ -754,7 +754,7 @@ def test_construction_int_rountrip(self, tz_naive_fixture):
754754

755755
def test_construction_from_replaced_timestamps_with_dst(self):
756756
# GH 18785
757-
index = pd.date_range(
757+
index = date_range(
758758
Timestamp(2000, 1, 1),
759759
Timestamp(2005, 1, 1),
760760
freq="MS",
@@ -804,15 +804,15 @@ def test_constructor_with_ambiguous_keyword_arg(self):
804804
start = Timestamp(year=2020, month=11, day=1, hour=1).tz_localize(
805805
timezone, ambiguous=False
806806
)
807-
result = pd.date_range(start=start, periods=2, ambiguous=False)
807+
result = date_range(start=start, periods=2, ambiguous=False)
808808
tm.assert_index_equal(result, expected)
809809

810810
# ambiguous keyword in end
811811
timezone = "America/New_York"
812812
end = Timestamp(year=2020, month=11, day=2, hour=1).tz_localize(
813813
timezone, ambiguous=False
814814
)
815-
result = pd.date_range(end=end, periods=2, ambiguous=False)
815+
result = date_range(end=end, periods=2, ambiguous=False)
816816
tm.assert_index_equal(result, expected)
817817

818818
def test_constructor_with_nonexistent_keyword_arg(self):
@@ -824,7 +824,7 @@ def test_constructor_with_nonexistent_keyword_arg(self):
824824
start = Timestamp("2015-03-29 02:30:00").tz_localize(
825825
timezone, nonexistent="shift_forward"
826826
)
827-
result = pd.date_range(start=start, periods=2, freq="H")
827+
result = date_range(start=start, periods=2, freq="H")
828828
expected = DatetimeIndex(
829829
[
830830
Timestamp("2015-03-29 03:00:00+02:00", tz=timezone),
@@ -838,7 +838,7 @@ def test_constructor_with_nonexistent_keyword_arg(self):
838838
end = Timestamp("2015-03-29 02:30:00").tz_localize(
839839
timezone, nonexistent="shift_forward"
840840
)
841-
result = pd.date_range(end=end, periods=2, freq="H")
841+
result = date_range(end=end, periods=2, freq="H")
842842
expected = DatetimeIndex(
843843
[
844844
Timestamp("2015-03-29 01:00:00+01:00", tz=timezone),

pandas/tests/indexes/datetimes/test_date_range.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -650,10 +650,10 @@ def test_timezone_comparaison_assert(self):
650650
def test_negative_non_tick_frequency_descending_dates(self, tz_aware_fixture):
651651
# GH 23270
652652
tz = tz_aware_fixture
653-
result = pd.date_range(start="2011-06-01", end="2011-01-01", freq="-1MS", tz=tz)
654-
expected = pd.date_range(
655-
end="2011-06-01", start="2011-01-01", freq="1MS", tz=tz
656-
)[::-1]
653+
result = date_range(start="2011-06-01", end="2011-01-01", freq="-1MS", tz=tz)
654+
expected = date_range(end="2011-06-01", start="2011-01-01", freq="1MS", tz=tz)[
655+
::-1
656+
]
657657
tm.assert_index_equal(result, expected)
658658

659659

@@ -739,10 +739,10 @@ def test_3(self):
739739

740740
def test_precision_finer_than_offset(self):
741741
# GH#9907
742-
result1 = pd.date_range(
742+
result1 = date_range(
743743
start="2015-04-15 00:00:03", end="2016-04-22 00:00:00", freq="Q"
744744
)
745-
result2 = pd.date_range(
745+
result2 = date_range(
746746
start="2015-04-15 00:00:03", end="2015-06-22 00:00:04", freq="W"
747747
)
748748
expected1_list = [
@@ -788,9 +788,9 @@ def test_mismatching_tz_raises_err(self, start, end):
788788
# issue 18488
789789
msg = "Start and end cannot both be tz-aware with different timezones"
790790
with pytest.raises(TypeError, match=msg):
791-
pd.date_range(start, end)
791+
date_range(start, end)
792792
with pytest.raises(TypeError, match=msg):
793-
pd.date_range(start, end, freq=BDay())
793+
date_range(start, end, freq=BDay())
794794

795795

796796
class TestBusinessDateRange:
@@ -849,18 +849,18 @@ def test_bdays_and_open_boundaries(self, closed):
849849
# GH 6673
850850
start = "2018-07-21" # Saturday
851851
end = "2018-07-29" # Sunday
852-
result = pd.date_range(start, end, freq="B", closed=closed)
852+
result = date_range(start, end, freq="B", closed=closed)
853853

854854
bday_start = "2018-07-23" # Monday
855855
bday_end = "2018-07-27" # Friday
856-
expected = pd.date_range(bday_start, bday_end, freq="D")
856+
expected = date_range(bday_start, bday_end, freq="D")
857857
tm.assert_index_equal(result, expected)
858858
# Note: we do _not_ expect the freqs to match here
859859

860860
def test_bday_near_overflow(self):
861861
# GH#24252 avoid doing unnecessary addition that _would_ overflow
862862
start = Timestamp.max.floor("D").to_pydatetime()
863-
rng = pd.date_range(start, end=None, periods=1, freq="B")
863+
rng = date_range(start, end=None, periods=1, freq="B")
864864
expected = DatetimeIndex([start], freq="B")
865865
tm.assert_index_equal(rng, expected)
866866

@@ -869,7 +869,7 @@ def test_bday_overflow_error(self):
869869
msg = "Out of bounds nanosecond timestamp"
870870
start = Timestamp.max.floor("D").to_pydatetime()
871871
with pytest.raises(OutOfBoundsDatetime, match=msg):
872-
pd.date_range(start, periods=2, freq="B")
872+
date_range(start, periods=2, freq="B")
873873

874874

875875
class TestCustomDateRange:
@@ -995,15 +995,15 @@ def test_all_custom_freq(self, freq):
995995
def test_range_with_millisecond_resolution(self, start_end):
996996
# https://github.com/pandas-dev/pandas/issues/24110
997997
start, end = start_end
998-
result = pd.date_range(start=start, end=end, periods=2, closed="left")
998+
result = date_range(start=start, end=end, periods=2, closed="left")
999999
expected = DatetimeIndex([start])
10001000
tm.assert_index_equal(result, expected)
10011001

10021002

10031003
def test_date_range_with_custom_holidays():
10041004
# GH 30593
10051005
freq = pd.offsets.CustomBusinessHour(start="15:00", holidays=["2020-11-26"])
1006-
result = pd.date_range(start="2020-11-25 15:00", periods=4, freq=freq)
1006+
result = date_range(start="2020-11-25 15:00", periods=4, freq=freq)
10071007
expected = DatetimeIndex(
10081008
[
10091009
"2020-11-25 15:00:00",

pandas/tests/indexes/datetimes/test_datetime.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def test_time_loc(self): # GH8667
6868
step = 24 * 3600
6969

7070
for n in ns:
71-
idx = pd.date_range("2014-11-26", periods=n, freq="S")
71+
idx = date_range("2014-11-26", periods=n, freq="S")
7272
ts = pd.Series(np.random.randn(n), index=idx)
7373
i = np.arange(start, n, step)
7474

@@ -89,10 +89,10 @@ def test_time_overflow_for_32bit_machines(self):
8989
# overflow.
9090
periods = np.int_(1000)
9191

92-
idx1 = pd.date_range(start="2000", periods=periods, freq="S")
92+
idx1 = date_range(start="2000", periods=periods, freq="S")
9393
assert len(idx1) == periods
9494

95-
idx2 = pd.date_range(end="2000", periods=periods, freq="S")
95+
idx2 = date_range(end="2000", periods=periods, freq="S")
9696
assert len(idx2) == periods
9797

9898
def test_nat(self):
@@ -251,7 +251,7 @@ def test_ns_index(self):
251251
index = DatetimeIndex(dt, freq=freq, name="time")
252252
self.assert_index_parameters(index)
253253

254-
new_index = pd.date_range(start=index[0], end=index[-1], freq=index.freq)
254+
new_index = date_range(start=index[0], end=index[-1], freq=index.freq)
255255
self.assert_index_parameters(new_index)
256256

257257
def test_factorize(self):
@@ -304,7 +304,7 @@ def test_factorize(self):
304304
def test_factorize_tz(self, tz_naive_fixture):
305305
tz = tz_naive_fixture
306306
# GH#13750
307-
base = pd.date_range("2016-11-05", freq="H", periods=100, tz=tz)
307+
base = date_range("2016-11-05", freq="H", periods=100, tz=tz)
308308
idx = base.repeat(5)
309309

310310
exp_arr = np.arange(100, dtype=np.intp).repeat(5)
@@ -317,14 +317,14 @@ def test_factorize_tz(self, tz_naive_fixture):
317317

318318
def test_factorize_dst(self):
319319
# GH 13750
320-
idx = pd.date_range("2016-11-06", freq="H", periods=12, tz="US/Eastern")
320+
idx = date_range("2016-11-06", freq="H", periods=12, tz="US/Eastern")
321321

322322
for obj in [idx, pd.Series(idx)]:
323323
arr, res = obj.factorize()
324324
tm.assert_numpy_array_equal(arr, np.arange(12, dtype=np.intp))
325325
tm.assert_index_equal(res, idx)
326326

327-
idx = pd.date_range("2016-06-13", freq="H", periods=12, tz="US/Eastern")
327+
idx = date_range("2016-06-13", freq="H", periods=12, tz="US/Eastern")
328328

329329
for obj in [idx, pd.Series(idx)]:
330330
arr, res = obj.factorize()
@@ -350,7 +350,7 @@ def test_unique(self, arr, expected):
350350

351351
def test_asarray_tz_naive(self):
352352
# This shouldn't produce a warning.
353-
idx = pd.date_range("2000", periods=2)
353+
idx = date_range("2000", periods=2)
354354
# M8[ns] by default
355355
result = np.asarray(idx)
356356

@@ -365,7 +365,7 @@ def test_asarray_tz_naive(self):
365365

366366
def test_asarray_tz_aware(self):
367367
tz = "US/Central"
368-
idx = pd.date_range("2000", periods=2, tz=tz)
368+
idx = date_range("2000", periods=2, tz=tz)
369369
expected = np.array(["2000-01-01T06", "2000-01-02T06"], dtype="M8[ns]")
370370
result = np.asarray(idx, dtype="datetime64[ns]")
371371

@@ -393,7 +393,7 @@ def test_to_frame_datetime_tz(self):
393393

394394
def test_split_non_utc(self):
395395
# GH 14042
396-
indices = pd.date_range("2016-01-01 00:00:00+0200", freq="S", periods=10)
396+
indices = date_range("2016-01-01 00:00:00+0200", freq="S", periods=10)
397397
result = np.split(indices, indices_or_sections=[])[0]
398398
expected = indices._with_freq(None)
399399
tm.assert_index_equal(result, expected)

0 commit comments

Comments
 (0)