Skip to content

Commit b2dcf2e

Browse files
authored
DEPR: deprecate strings T, S, L, U, and N in offsets frequencies, resolution abbreviations, _attrname_to_abbrevs (#54061)
1 parent a73fa32 commit b2dcf2e

File tree

118 files changed

+1074
-861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1074
-861
lines changed

asv_bench/benchmarks/arithmetic.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ class Timeseries:
262262
def setup(self, tz):
263263
N = 10**6
264264
halfway = (N // 2) - 1
265-
self.s = Series(date_range("20010101", periods=N, freq="T", tz=tz))
265+
self.s = Series(date_range("20010101", periods=N, freq="min", tz=tz))
266266
self.ts = self.s[halfway]
267267

268268
self.s2 = Series(date_range("20010101", periods=N, freq="s", tz=tz))
@@ -460,7 +460,7 @@ class OffsetArrayArithmetic:
460460

461461
def setup(self, offset):
462462
N = 10000
463-
rng = date_range(start="1/1/2000", periods=N, freq="T")
463+
rng = date_range(start="1/1/2000", periods=N, freq="min")
464464
self.rng = rng
465465
self.ser = Series(rng)
466466

@@ -479,7 +479,7 @@ class ApplyIndex:
479479

480480
def setup(self, offset):
481481
N = 10000
482-
rng = date_range(start="1/1/2000", periods=N, freq="T")
482+
rng = date_range(start="1/1/2000", periods=N, freq="min")
483483
self.rng = rng
484484

485485
def time_apply_index(self, offset):

asv_bench/benchmarks/eval.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Query:
4444
def setup(self):
4545
N = 10**6
4646
halfway = (N // 2) - 1
47-
index = pd.date_range("20010101", periods=N, freq="T")
47+
index = pd.date_range("20010101", periods=N, freq="min")
4848
s = pd.Series(index)
4949
self.ts = s.iloc[halfway]
5050
self.df = pd.DataFrame({"a": np.random.randn(N), "dates": index}, index=index)

asv_bench/benchmarks/gil.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ def time_kth_smallest(self):
178178
class ParallelDatetimeFields:
179179
def setup(self):
180180
N = 10**6
181-
self.dti = date_range("1900-01-01", periods=N, freq="T")
181+
self.dti = date_range("1900-01-01", periods=N, freq="min")
182182
self.period = self.dti.to_period("D")
183183

184184
def time_datetime_field_year(self):

asv_bench/benchmarks/index_cached_properties.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ def setup(self, index_type):
2525
N = 10**5
2626
if index_type == "MultiIndex":
2727
self.idx = pd.MultiIndex.from_product(
28-
[pd.date_range("1/1/2000", freq="T", periods=N // 2), ["a", "b"]]
28+
[pd.date_range("1/1/2000", freq="min", periods=N // 2), ["a", "b"]]
2929
)
3030
elif index_type == "DatetimeIndex":
31-
self.idx = pd.date_range("1/1/2000", freq="T", periods=N)
31+
self.idx = pd.date_range("1/1/2000", freq="min", periods=N)
3232
elif index_type == "Int64Index":
3333
self.idx = pd.Index(range(N), dtype="int64")
3434
elif index_type == "PeriodIndex":
35-
self.idx = pd.period_range("1/1/2000", freq="T", periods=N)
35+
self.idx = pd.period_range("1/1/2000", freq="min", periods=N)
3636
elif index_type == "RangeIndex":
3737
self.idx = pd.RangeIndex(start=0, stop=N)
3838
elif index_type == "IntervalIndex":

asv_bench/benchmarks/index_object.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class SetOperations:
2525

2626
def setup(self, index_structure, dtype, method):
2727
N = 10**5
28-
dates_left = date_range("1/1/2000", periods=N, freq="T")
28+
dates_left = date_range("1/1/2000", periods=N, freq="min")
2929
fmt = "%Y-%m-%d %H:%M:%S"
3030
date_str_left = Index(dates_left.strftime(fmt))
3131
int_left = Index(np.arange(N))

asv_bench/benchmarks/io/json.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ def time_float_longint_str_lines(self):
290290
class ToJSONMem:
291291
def setup_cache(self):
292292
df = DataFrame([[1]])
293-
df2 = DataFrame(range(8), date_range("1/1/2000", periods=8, freq="T"))
293+
df2 = DataFrame(range(8), date_range("1/1/2000", periods=8, freq="min"))
294294
frames = {"int": df, "float": df.astype(float), "datetime": df2}
295295

296296
return frames

asv_bench/benchmarks/join_merge.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ class JoinNonUnique:
212212
# outer join of non-unique
213213
# GH 6329
214214
def setup(self):
215-
date_index = date_range("01-Jan-2013", "23-Jan-2013", freq="T")
215+
date_index = date_range("01-Jan-2013", "23-Jan-2013", freq="min")
216216
daily_dates = date_index.to_period("D").to_timestamp("S", "S")
217217
self.fracofday = date_index.values - daily_dates.values
218218
self.fracofday = self.fracofday.astype("timedelta64[ns]")
@@ -338,7 +338,7 @@ class MergeDatetime:
338338
def setup(self, units, tz):
339339
unit_left, unit_right = units
340340
N = 10_000
341-
keys = Series(date_range("2012-01-01", freq="T", periods=N, tz=tz))
341+
keys = Series(date_range("2012-01-01", freq="min", periods=N, tz=tz))
342342
self.left = DataFrame(
343343
{
344344
"key": keys.sample(N * 10, replace=True).dt.as_unit(unit_left),

asv_bench/benchmarks/sparse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class SparseSeriesToFrame:
2222
def setup(self):
2323
K = 50
2424
N = 50001
25-
rng = date_range("1/1/2000", periods=N, freq="T")
25+
rng = date_range("1/1/2000", periods=N, freq="min")
2626
self.series = {}
2727
for i in range(1, K):
2828
data = np.random.randn(N)[:-i]

asv_bench/benchmarks/timeseries.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def time_infer_freq(self, freq):
116116
class TimeDatetimeConverter:
117117
def setup(self):
118118
N = 100000
119-
self.rng = date_range(start="1/1/2000", periods=N, freq="T")
119+
self.rng = date_range(start="1/1/2000", periods=N, freq="min")
120120

121121
def time_convert(self):
122122
DatetimeConverter.convert(self.rng, None, None)
@@ -129,9 +129,9 @@ class Iteration:
129129
def setup(self, time_index):
130130
N = 10**6
131131
if time_index is timedelta_range:
132-
self.idx = time_index(start=0, freq="T", periods=N)
132+
self.idx = time_index(start=0, freq="min", periods=N)
133133
else:
134-
self.idx = time_index(start="20140101", freq="T", periods=N)
134+
self.idx = time_index(start="20140101", freq="min", periods=N)
135135
self.exit = 10000
136136

137137
def time_iter(self, time_index):
@@ -149,7 +149,7 @@ class ResampleDataFrame:
149149
param_names = ["method"]
150150

151151
def setup(self, method):
152-
rng = date_range(start="20130101", periods=100000, freq="50L")
152+
rng = date_range(start="20130101", periods=100000, freq="50ms")
153153
df = DataFrame(np.random.randn(100000, 2), index=rng)
154154
self.resample = getattr(df.resample("1s"), method)
155155

@@ -163,8 +163,8 @@ class ResampleSeries:
163163

164164
def setup(self, index, freq, method):
165165
indexes = {
166-
"period": period_range(start="1/1/2000", end="1/1/2001", freq="T"),
167-
"datetime": date_range(start="1/1/2000", end="1/1/2001", freq="T"),
166+
"period": period_range(start="1/1/2000", end="1/1/2001", freq="min"),
167+
"datetime": date_range(start="1/1/2000", end="1/1/2001", freq="min"),
168168
}
169169
idx = indexes[index]
170170
ts = Series(np.random.randn(len(idx)), index=idx)
@@ -178,7 +178,7 @@ class ResampleDatetetime64:
178178
# GH 7754
179179
def setup(self):
180180
rng3 = date_range(
181-
start="2000-01-01 00:00:00", end="2000-01-01 10:00:00", freq="555000U"
181+
start="2000-01-01 00:00:00", end="2000-01-01 10:00:00", freq="555000us"
182182
)
183183
self.dt_ts = Series(5, rng3, dtype="datetime64[ns]")
184184

@@ -270,7 +270,7 @@ class DatetimeAccessor:
270270

271271
def setup(self, tz):
272272
N = 100000
273-
self.series = Series(date_range(start="1/1/2000", periods=N, freq="T", tz=tz))
273+
self.series = Series(date_range(start="1/1/2000", periods=N, freq="min", tz=tz))
274274

275275
def time_dt_accessor(self, tz):
276276
self.series.dt

asv_bench/benchmarks/tslibs/timestamp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ def time_to_julian_date(self, tz):
136136
self.ts.to_julian_date()
137137

138138
def time_floor(self, tz):
139-
self.ts.floor("5T")
139+
self.ts.floor("5min")
140140

141141
def time_ceil(self, tz):
142-
self.ts.ceil("5T")
142+
self.ts.ceil("5min")
143143

144144

145145
class TimestampAcrossDst:

0 commit comments

Comments
 (0)