Skip to content

Commit b2d9ec1

Browse files
lukemanleylukemanley
authored
ASV: avoid "H" and "S" freq deprecations (pandas-dev#55921)
update ASVs for freq deprecations
1 parent 6296e03 commit b2d9ec1

18 files changed

+41
-41
lines changed

‎asv_bench/benchmarks/algorithms.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ def setup(self, unique, sort, dtype):
5050
"float": pd.Index(np.random.randn(N), dtype="float64"),
5151
"object_str": string_index,
5252
"object": pd.Index(np.arange(N), dtype="object"),
53-
"datetime64[ns]": pd.date_range("2011-01-01", freq="H", periods=N),
53+
"datetime64[ns]": pd.date_range("2011-01-01", freq="h", periods=N),
5454
"datetime64[ns, tz]": pd.date_range(
55-
"2011-01-01", freq="H", periods=N, tz="Asia/Tokyo"
55+
"2011-01-01", freq="h", periods=N, tz="Asia/Tokyo"
5656
),
5757
"Int64": pd.array(np.arange(N), dtype="Int64"),
5858
"boolean": pd.array(np.random.randint(0, 2, N), dtype="boolean"),
@@ -93,9 +93,9 @@ def setup(self, unique, keep, dtype):
9393
"uint": pd.Index(np.arange(N), dtype="uint64"),
9494
"float": pd.Index(np.random.randn(N), dtype="float64"),
9595
"string": tm.makeStringIndex(N),
96-
"datetime64[ns]": pd.date_range("2011-01-01", freq="H", periods=N),
96+
"datetime64[ns]": pd.date_range("2011-01-01", freq="h", periods=N),
9797
"datetime64[ns, tz]": pd.date_range(
98-
"2011-01-01", freq="H", periods=N, tz="Asia/Tokyo"
98+
"2011-01-01", freq="h", periods=N, tz="Asia/Tokyo"
9999
),
100100
"timestamp[ms][pyarrow]": pd.Index(
101101
np.arange(N), dtype=pd.ArrowDtype(pa.timestamp("ms"))

‎asv_bench/benchmarks/arithmetic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ class BinaryOpsMultiIndex:
491491
param_names = ["func"]
492492

493493
def setup(self, func):
494-
array = date_range("20200101 00:00", "20200102 0:00", freq="S")
494+
array = date_range("20200101 00:00", "20200102 0:00", freq="s")
495495
level_0_names = [str(i) for i in range(30)]
496496

497497
index = pd.MultiIndex.from_product([level_0_names, array])

‎asv_bench/benchmarks/frame_methods.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,9 @@ def setup(self, inplace, dtype):
439439
N, M = 10000, 100
440440
if dtype in ("datetime64[ns]", "datetime64[ns, tz]", "timedelta64[ns]"):
441441
data = {
442-
"datetime64[ns]": date_range("2011-01-01", freq="H", periods=N),
442+
"datetime64[ns]": date_range("2011-01-01", freq="h", periods=N),
443443
"datetime64[ns, tz]": date_range(
444-
"2011-01-01", freq="H", periods=N, tz="Asia/Tokyo"
444+
"2011-01-01", freq="h", periods=N, tz="Asia/Tokyo"
445445
),
446446
"timedelta64[ns]": timedelta_range(start="1 day", periods=N, freq="1D"),
447447
}
@@ -649,7 +649,7 @@ def time_series_nunique_nan(self):
649649
class Duplicated:
650650
def setup(self):
651651
n = 1 << 20
652-
t = date_range("2015-01-01", freq="S", periods=(n // 64))
652+
t = date_range("2015-01-01", freq="s", periods=(n // 64))
653653
xs = np.random.randn(n // 64).round(2)
654654
self.df = DataFrame(
655655
{

‎asv_bench/benchmarks/gil.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def run(dti):
212212
def time_datetime_to_period(self):
213213
@test_parallel(num_threads=2)
214214
def run(dti):
215-
dti.to_period("S")
215+
dti.to_period("s")
216216

217217
run(self.dti)
218218

‎asv_bench/benchmarks/groupby.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ def time_series_nth(self, dtype):
238238

239239
class DateAttributes:
240240
def setup(self):
241-
rng = date_range("1/1/2000", "12/31/2005", freq="H")
241+
rng = date_range("1/1/2000", "12/31/2005", freq="h")
242242
self.year, self.month, self.day = rng.year, rng.month, rng.day
243243
self.ts = Series(np.random.randn(len(rng)), index=rng)
244244

‎asv_bench/benchmarks/indexing.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ def setup(self, index):
232232
N = 100000
233233
indexes = {
234234
"int": Index(np.arange(N), dtype=np.int64),
235-
"datetime": date_range("2011-01-01", freq="S", periods=N),
235+
"datetime": date_range("2011-01-01", freq="s", periods=N),
236236
}
237237
index = indexes[index]
238238
self.s = Series(np.random.rand(N), index=index)
@@ -465,7 +465,7 @@ def time_loc_row(self, unique_cols):
465465
class AssignTimeseriesIndex:
466466
def setup(self):
467467
N = 100000
468-
idx = date_range("1/1/2000", periods=N, freq="H")
468+
idx = date_range("1/1/2000", periods=N, freq="h")
469469
self.df = DataFrame(np.random.randn(N, 1), columns=["A"], index=idx)
470470

471471
def time_frame_assign_timeseries_index(self):

‎asv_bench/benchmarks/inference.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def time_unique_date_strings(self, cache, count):
164164

165165
class ToDatetimeISO8601:
166166
def setup(self):
167-
rng = date_range(start="1/1/2000", periods=20000, freq="H")
167+
rng = date_range(start="1/1/2000", periods=20000, freq="h")
168168
self.strings = rng.strftime("%Y-%m-%d %H:%M:%S").tolist()
169169
self.strings_nosep = rng.strftime("%Y%m%d %H:%M:%S").tolist()
170170
self.strings_tz_space = [
@@ -276,7 +276,7 @@ def time_dup_string_tzoffset_dates(self, cache):
276276
# GH 43901
277277
class ToDatetimeInferDatetimeFormat:
278278
def setup(self):
279-
rng = date_range(start="1/1/2000", periods=100000, freq="H")
279+
rng = date_range(start="1/1/2000", periods=100000, freq="h")
280280
self.strings = rng.strftime("%Y-%m-%d %H:%M:%S").tolist()
281281

282282
def time_infer_datetime_format(self):

‎asv_bench/benchmarks/io/csv.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class ToCSVDatetimeIndex(BaseIO):
8989
fname = "__test__.csv"
9090

9191
def setup(self):
92-
rng = date_range("2000", periods=100_000, freq="S")
92+
rng = date_range("2000", periods=100_000, freq="s")
9393
self.data = DataFrame({"a": 1}, index=rng)
9494

9595
def time_frame_date_formatting_index(self):
@@ -102,15 +102,15 @@ def time_frame_date_no_format_index(self):
102102
class ToCSVPeriod(BaseIO):
103103
fname = "__test__.csv"
104104

105-
params = ([1000, 10000], ["D", "H"])
105+
params = ([1000, 10000], ["D", "h"])
106106
param_names = ["nobs", "freq"]
107107

108108
def setup(self, nobs, freq):
109109
rng = period_range(start="2000-01-01", periods=nobs, freq=freq)
110110
self.data = DataFrame(rng)
111111
if freq == "D":
112112
self.default_fmt = "%Y-%m-%d"
113-
elif freq == "H":
113+
elif freq == "h":
114114
self.default_fmt = "%Y-%m-%d %H:00"
115115

116116
def time_frame_period_formatting_default(self, nobs, freq):
@@ -130,15 +130,15 @@ def time_frame_period_formatting(self, nobs, freq):
130130
class ToCSVPeriodIndex(BaseIO):
131131
fname = "__test__.csv"
132132

133-
params = ([1000, 10000], ["D", "H"])
133+
params = ([1000, 10000], ["D", "h"])
134134
param_names = ["nobs", "freq"]
135135

136136
def setup(self, nobs, freq):
137137
rng = period_range(start="2000-01-01", periods=nobs, freq=freq)
138138
self.data = DataFrame({"a": 1}, index=rng)
139139
if freq == "D":
140140
self.default_fmt = "%Y-%m-%d"
141-
elif freq == "H":
141+
elif freq == "h":
142142
self.default_fmt = "%Y-%m-%d %H:00"
143143

144144
def time_frame_period_formatting_index(self, nobs, freq):
@@ -253,7 +253,7 @@ class ReadCSVConcatDatetime(StringIORewind):
253253
iso8601 = "%Y-%m-%d %H:%M:%S"
254254

255255
def setup(self):
256-
rng = date_range("1/1/2000", periods=50000, freq="S")
256+
rng = date_range("1/1/2000", periods=50000, freq="s")
257257
self.StringIO_input = StringIO("\n".join(rng.strftime(self.iso8601).tolist()))
258258

259259
def time_read_csv(self):

‎asv_bench/benchmarks/io/excel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def _generate_dataframe():
2525
df = DataFrame(
2626
np.random.randn(N, C),
2727
columns=[f"float{i}" for i in range(C)],
28-
index=date_range("20000101", periods=N, freq="H"),
28+
index=date_range("20000101", periods=N, freq="h"),
2929
)
3030
df["object"] = tm.makeStringIndex(N)
3131
return df

‎asv_bench/benchmarks/io/hdf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def setup(self, format):
122122
self.df = DataFrame(
123123
np.random.randn(N, C),
124124
columns=[f"float{i}" for i in range(C)],
125-
index=date_range("20000101", periods=N, freq="H"),
125+
index=date_range("20000101", periods=N, freq="h"),
126126
)
127127
self.df["object"] = tm.makeStringIndex(N)
128128
self.df.to_hdf(self.fname, "df", format=format)

‎asv_bench/benchmarks/io/json.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def setup(self, orient, index):
2626
N = 100000
2727
indexes = {
2828
"int": np.arange(N),
29-
"datetime": date_range("20000101", periods=N, freq="H"),
29+
"datetime": date_range("20000101", periods=N, freq="h"),
3030
}
3131
df = DataFrame(
3232
np.random.randn(N, 5),
@@ -48,7 +48,7 @@ def setup(self, index):
4848
N = 100000
4949
indexes = {
5050
"int": np.arange(N),
51-
"datetime": date_range("20000101", periods=N, freq="H"),
51+
"datetime": date_range("20000101", periods=N, freq="h"),
5252
}
5353
df = DataFrame(
5454
np.random.randn(N, 5),
@@ -108,7 +108,7 @@ class ToJSON(BaseIO):
108108
def setup(self, orient, frame):
109109
N = 10**5
110110
ncols = 5
111-
index = date_range("20000101", periods=N, freq="H")
111+
index = date_range("20000101", periods=N, freq="h")
112112
timedeltas = timedelta_range(start=1, periods=N, freq="s")
113113
datetimes = date_range(start=1, periods=N, freq="s")
114114
ints = np.random.randint(100000000, size=N)
@@ -191,7 +191,7 @@ class ToJSONISO(BaseIO):
191191

192192
def setup(self, orient):
193193
N = 10**5
194-
index = date_range("20000101", periods=N, freq="H")
194+
index = date_range("20000101", periods=N, freq="h")
195195
timedeltas = timedelta_range(start=1, periods=N, freq="s")
196196
datetimes = date_range(start=1, periods=N, freq="s")
197197
self.df = DataFrame(
@@ -214,7 +214,7 @@ class ToJSONLines(BaseIO):
214214
def setup(self):
215215
N = 10**5
216216
ncols = 5
217-
index = date_range("20000101", periods=N, freq="H")
217+
index = date_range("20000101", periods=N, freq="h")
218218
timedeltas = timedelta_range(start=1, periods=N, freq="s")
219219
datetimes = date_range(start=1, periods=N, freq="s")
220220
ints = np.random.randint(100000000, size=N)

‎asv_bench/benchmarks/io/pickle.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def setup(self):
2020
self.df = DataFrame(
2121
np.random.randn(N, C),
2222
columns=[f"float{i}" for i in range(C)],
23-
index=date_range("20000101", periods=N, freq="H"),
23+
index=date_range("20000101", periods=N, freq="h"),
2424
)
2525
self.df["object"] = tm.makeStringIndex(N)
2626
self.df.to_pickle(self.fname)

‎asv_bench/benchmarks/io/stata.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def setup(self, convert_dates):
2323
self.df = DataFrame(
2424
np.random.randn(N, C),
2525
columns=[f"float{i}" for i in range(C)],
26-
index=date_range("20000101", periods=N, freq="H"),
26+
index=date_range("20000101", periods=N, freq="h"),
2727
)
2828
self.df["object"] = tm.makeStringIndex(self.N)
2929
self.df["int8_"] = np.random.randint(

‎asv_bench/benchmarks/join_merge.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ class JoinNonUnique:
213213
# GH 6329
214214
def setup(self):
215215
date_index = date_range("01-Jan-2013", "23-Jan-2013", freq="min")
216-
daily_dates = date_index.to_period("D").to_timestamp("S", "S")
216+
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]")
219219
self.fracofday = self.fracofday.astype(np.float64) / 86_400_000_000_000

‎asv_bench/benchmarks/period.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def time_from_ints_daily(self, freq, is_offset):
4545

4646
class DataFramePeriodColumn:
4747
def setup(self):
48-
self.rng = period_range(start="1/1/1990", freq="S", periods=20000)
48+
self.rng = period_range(start="1/1/1990", freq="s", periods=20000)
4949
self.df = DataFrame(index=range(len(self.rng)))
5050

5151
def time_setitem_period_column(self):

‎asv_bench/benchmarks/series_methods.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def setup(self, dtype):
6464
N = 10**6
6565
data = {
6666
"int": np.random.randint(1, 10, N),
67-
"datetime": date_range("2000-01-01", freq="S", periods=N),
67+
"datetime": date_range("2000-01-01", freq="s", periods=N),
6868
}
6969
self.s = Series(data[dtype])
7070
if dtype == "datetime":
@@ -92,7 +92,7 @@ class Fillna:
9292
def setup(self, dtype):
9393
N = 10**6
9494
if dtype == "datetime64[ns]":
95-
data = date_range("2000-01-01", freq="S", periods=N)
95+
data = date_range("2000-01-01", freq="s", periods=N)
9696
na_value = NaT
9797
elif dtype in ("float64", "Float64"):
9898
data = np.random.randn(N)

‎asv_bench/benchmarks/strftime.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def time_frame_datetime_formatting_custom(self, nobs):
5353

5454
class PeriodStrftime:
5555
timeout = 1500
56-
params = ([1000, 10000], ["D", "H"])
56+
params = ([1000, 10000], ["D", "h"])
5757
param_names = ["nobs", "freq"]
5858

5959
def setup(self, nobs, freq):
@@ -67,7 +67,7 @@ def setup(self, nobs, freq):
6767
self.data.set_index("i", inplace=True)
6868
if freq == "D":
6969
self.default_fmt = "%Y-%m-%d"
70-
elif freq == "H":
70+
elif freq == "h":
7171
self.default_fmt = "%Y-%m-%d %H:00"
7272

7373
def time_frame_period_to_str(self, nobs, freq):

‎asv_bench/benchmarks/timeseries.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def setup(self, index_type):
2727
N = 100000
2828
dtidxes = {
2929
"dst": date_range(
30-
start="10/29/2000 1:00:00", end="10/29/2000 1:59:59", freq="S"
30+
start="10/29/2000 1:00:00", end="10/29/2000 1:59:59", freq="s"
3131
),
3232
"repeated": date_range(start="2000", periods=N / 10, freq="s").repeat(10),
3333
"tz_aware": date_range(start="2000", periods=N, freq="s", tz="US/Eastern"),
@@ -72,13 +72,13 @@ class TzLocalize:
7272

7373
def setup(self, tz):
7474
dst_rng = date_range(
75-
start="10/29/2000 1:00:00", end="10/29/2000 1:59:59", freq="S"
75+
start="10/29/2000 1:00:00", end="10/29/2000 1:59:59", freq="s"
7676
)
77-
self.index = date_range(start="10/29/2000", end="10/29/2000 00:59:59", freq="S")
77+
self.index = date_range(start="10/29/2000", end="10/29/2000 00:59:59", freq="s")
7878
self.index = self.index.append(dst_rng)
7979
self.index = self.index.append(dst_rng)
8080
self.index = self.index.append(
81-
date_range(start="10/29/2000 2:00:00", end="10/29/2000 3:00:00", freq="S")
81+
date_range(start="10/29/2000 2:00:00", end="10/29/2000 3:00:00", freq="s")
8282
)
8383

8484
def time_infer_dst(self, tz):
@@ -90,7 +90,7 @@ class ResetIndex:
9090
param_names = "tz"
9191

9292
def setup(self, tz):
93-
idx = date_range(start="1/1/2000", periods=1000, freq="H", tz=tz)
93+
idx = date_range(start="1/1/2000", periods=1000, freq="h", tz=tz)
9494
self.df = DataFrame(np.random.randn(1000, 2), index=idx)
9595

9696
def time_reset_datetimeindex(self, tz):
@@ -255,7 +255,7 @@ def time_get_slice(self, monotonic):
255255
class Lookup:
256256
def setup(self):
257257
N = 1500000
258-
rng = date_range(start="1/1/2000", periods=N, freq="S")
258+
rng = date_range(start="1/1/2000", periods=N, freq="s")
259259
self.ts = Series(1, index=rng)
260260
self.lookup_val = rng[N // 2]
261261

0 commit comments

Comments
 (0)