Skip to content

Commit aefede9

Browse files
authored
CLN/ASV: avoid deprecation warnings in ASVs (#54301)
avoid deprecation warnings in ASVs
1 parent d75e26b commit aefede9

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

asv_bench/benchmarks/groupby.py

+17-14
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ def time_multi_size(self):
408408
self.df.groupby(["key1", "key2"]).size()
409409

410410
def time_category_size(self):
411-
self.draws.groupby(self.cats).size()
411+
self.draws.groupby(self.cats, observed=True).size()
412412

413413

414414
class Shift:
@@ -767,7 +767,10 @@ def time_str_func(self, dtype, method):
767767

768768

769769
class Categories:
770-
def setup(self):
770+
params = [True, False]
771+
param_names = ["observed"]
772+
773+
def setup(self, observed):
771774
N = 10**5
772775
arr = np.random.random(N)
773776
data = {"a": Categorical(np.random.randint(10000, size=N)), "b": arr}
@@ -785,23 +788,23 @@ def setup(self):
785788
}
786789
self.df_extra_cat = DataFrame(data)
787790

788-
def time_groupby_sort(self):
789-
self.df.groupby("a")["b"].count()
791+
def time_groupby_sort(self, observed):
792+
self.df.groupby("a", observed=observed)["b"].count()
790793

791-
def time_groupby_nosort(self):
792-
self.df.groupby("a", sort=False)["b"].count()
794+
def time_groupby_nosort(self, observed):
795+
self.df.groupby("a", observed=observed, sort=False)["b"].count()
793796

794-
def time_groupby_ordered_sort(self):
795-
self.df_ordered.groupby("a")["b"].count()
797+
def time_groupby_ordered_sort(self, observed):
798+
self.df_ordered.groupby("a", observed=observed)["b"].count()
796799

797-
def time_groupby_ordered_nosort(self):
798-
self.df_ordered.groupby("a", sort=False)["b"].count()
800+
def time_groupby_ordered_nosort(self, observed):
801+
self.df_ordered.groupby("a", observed=observed, sort=False)["b"].count()
799802

800-
def time_groupby_extra_cat_sort(self):
801-
self.df_extra_cat.groupby("a")["b"].count()
803+
def time_groupby_extra_cat_sort(self, observed):
804+
self.df_extra_cat.groupby("a", observed=observed)["b"].count()
802805

803-
def time_groupby_extra_cat_nosort(self):
804-
self.df_extra_cat.groupby("a", sort=False)["b"].count()
806+
def time_groupby_extra_cat_nosort(self, observed):
807+
self.df_extra_cat.groupby("a", observed=observed, sort=False)["b"].count()
805808

806809

807810
class Datelike:

asv_bench/benchmarks/io/csv.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -226,26 +226,26 @@ def data(self, stringio_object):
226226

227227

228228
class ReadCSVDInferDatetimeFormat(StringIORewind):
229-
params = ([True, False], ["custom", "iso8601", "ymd"])
230-
param_names = ["infer_datetime_format", "format"]
229+
params = [None, "custom", "iso8601", "ymd"]
230+
param_names = ["format"]
231231

232-
def setup(self, infer_datetime_format, format):
232+
def setup(self, format):
233233
rng = date_range("1/1/2000", periods=1000)
234234
formats = {
235+
None: None,
235236
"custom": "%m/%d/%Y %H:%M:%S.%f",
236237
"iso8601": "%Y-%m-%d %H:%M:%S",
237238
"ymd": "%Y%m%d",
238239
}
239240
dt_format = formats[format]
240241
self.StringIO_input = StringIO("\n".join(rng.strftime(dt_format).tolist()))
241242

242-
def time_read_csv(self, infer_datetime_format, format):
243+
def time_read_csv(self, format):
243244
read_csv(
244245
self.data(self.StringIO_input),
245246
header=None,
246247
names=["foo"],
247248
parse_dates=["foo"],
248-
infer_datetime_format=infer_datetime_format,
249249
)
250250

251251

@@ -262,7 +262,6 @@ def time_read_csv(self):
262262
header=None,
263263
names=["foo"],
264264
parse_dates=["foo"],
265-
infer_datetime_format=False,
266265
)
267266

268267

@@ -279,7 +278,6 @@ def time_read_csv(self, bad_date_value):
279278
header=None,
280279
names=["foo", "bar"],
281280
parse_dates=["foo"],
282-
infer_datetime_format=False,
283281
)
284282

285283

asv_bench/benchmarks/replace.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ReplaceList:
4242
param_names = ["inplace"]
4343

4444
def setup(self, inplace):
45-
self.df = pd.DataFrame({"A": 0, "B": 0}, index=range(4 * 10**7))
45+
self.df = pd.DataFrame({"A": 0, "B": 0}, index=range(10**7))
4646

4747
def time_replace_list(self, inplace):
4848
self.df.replace([np.inf, -np.inf], np.nan, inplace=inplace)

0 commit comments

Comments
 (0)