Skip to content

Commit 1c070f4

Browse files
committed
Merge remote-tracking branch 'upstream/main' into 49277
2 parents 6015196 + dbe0c10 commit 1c070f4

Some content is hidden

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

67 files changed

+194
-1074
lines changed

asv_bench/benchmarks/io/stata.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ def setup(self, convert_dates):
3838
)
3939
self.df["float32_"] = np.array(np.random.randn(N), dtype=np.float32)
4040
self.convert_dates = {"index": convert_dates}
41-
self.df.to_stata(self.fname, self.convert_dates)
41+
self.df.to_stata(self.fname, convert_dates=self.convert_dates)
4242

4343
def time_read_stata(self, convert_dates):
4444
read_stata(self.fname)
4545

4646
def time_write_stata(self, convert_dates):
47-
self.df.to_stata(self.fname, self.convert_dates)
47+
self.df.to_stata(self.fname, convert_dates=self.convert_dates)
4848

4949

5050
class StataMissing(Stata):
@@ -54,7 +54,7 @@ def setup(self, convert_dates):
5454
missing_data = np.random.randn(self.N)
5555
missing_data[missing_data < 0] = np.nan
5656
self.df[f"missing_{i}"] = missing_data
57-
self.df.to_stata(self.fname, self.convert_dates)
57+
self.df.to_stata(self.fname, convert_dates=self.convert_dates)
5858

5959

6060
from ..pandas_vb_common import setup # noqa: F401 isort:skip

asv_bench/benchmarks/tslibs/offsets.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,8 @@ def setup(self, offset):
7171
self.date = datetime(2011, 1, 1)
7272
self.dt64 = np.datetime64("2011-01-01 09:00Z")
7373

74-
def time_apply(self, offset):
75-
offset.apply(self.date)
76-
77-
def time_apply_np_dt64(self, offset):
78-
offset.apply(self.dt64)
74+
def time_add_np_dt64(self, offset):
75+
offset + self.dt64
7976

8077
def time_add(self, offset):
8178
self.date + offset

doc/redirects.csv

-7
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,8 @@ generated/pandas.DataFrame.isna,../reference/api/pandas.DataFrame.isna
398398
generated/pandas.DataFrame.isnull,../reference/api/pandas.DataFrame.isnull
399399
generated/pandas.DataFrame.items,../reference/api/pandas.DataFrame.items
400400
generated/pandas.DataFrame.__iter__,../reference/api/pandas.DataFrame.__iter__
401-
generated/pandas.DataFrame.iteritems,../reference/api/pandas.DataFrame.iteritems
402401
generated/pandas.DataFrame.iterrows,../reference/api/pandas.DataFrame.iterrows
403402
generated/pandas.DataFrame.itertuples,../reference/api/pandas.DataFrame.itertuples
404-
generated/pandas.DataFrame.ix,../reference/api/pandas.DataFrame.ix
405403
generated/pandas.DataFrame.join,../reference/api/pandas.DataFrame.join
406404
generated/pandas.DataFrame.keys,../reference/api/pandas.DataFrame.keys
407405
generated/pandas.DataFrame.kurt,../reference/api/pandas.DataFrame.kurt
@@ -569,7 +567,6 @@ generated/pandas.DatetimeIndex.strftime,../reference/api/pandas.DatetimeIndex.st
569567
generated/pandas.DatetimeIndex.time,../reference/api/pandas.DatetimeIndex.time
570568
generated/pandas.DatetimeIndex.timetz,../reference/api/pandas.DatetimeIndex.timetz
571569
generated/pandas.DatetimeIndex.to_frame,../reference/api/pandas.DatetimeIndex.to_frame
572-
generated/pandas.DatetimeIndex.to_perioddelta,../reference/api/pandas.DatetimeIndex.to_perioddelta
573570
generated/pandas.DatetimeIndex.to_period,../reference/api/pandas.DatetimeIndex.to_period
574571
generated/pandas.DatetimeIndex.to_pydatetime,../reference/api/pandas.DatetimeIndex.to_pydatetime
575572
generated/pandas.DatetimeIndex.to_series,../reference/api/pandas.DatetimeIndex.to_series
@@ -702,7 +699,6 @@ generated/pandas.Index.rename,../reference/api/pandas.Index.rename
702699
generated/pandas.Index.repeat,../reference/api/pandas.Index.repeat
703700
generated/pandas.Index.searchsorted,../reference/api/pandas.Index.searchsorted
704701
generated/pandas.Index.set_names,../reference/api/pandas.Index.set_names
705-
generated/pandas.Index.set_value,../reference/api/pandas.Index.set_value
706702
generated/pandas.Index.shape,../reference/api/pandas.Index.shape
707703
generated/pandas.Index.shift,../reference/api/pandas.Index.shift
708704
generated/pandas.Index.size,../reference/api/pandas.Index.size
@@ -721,7 +717,6 @@ generated/pandas.Index.to_flat_index,../reference/api/pandas.Index.to_flat_index
721717
generated/pandas.Index.to_frame,../reference/api/pandas.Index.to_frame
722718
generated/pandas.Index.to_list,../reference/api/pandas.Index.to_list
723719
generated/pandas.Index.tolist,../reference/api/pandas.Index.tolist
724-
generated/pandas.Index.to_native_types,../reference/api/pandas.Index.to_native_types
725720
generated/pandas.Index.to_numpy,../reference/api/pandas.Index.to_numpy
726721
generated/pandas.Index.to_series,../reference/api/pandas.Index.to_series
727722
generated/pandas.Index.transpose,../reference/api/pandas.Index.transpose
@@ -1081,8 +1076,6 @@ generated/pandas.Series.is_unique,../reference/api/pandas.Series.is_unique
10811076
generated/pandas.Series.item,../reference/api/pandas.Series.item
10821077
generated/pandas.Series.items,../reference/api/pandas.Series.items
10831078
generated/pandas.Series.__iter__,../reference/api/pandas.Series.__iter__
1084-
generated/pandas.Series.iteritems,../reference/api/pandas.Series.iteritems
1085-
generated/pandas.Series.ix,../reference/api/pandas.Series.ix
10861079
generated/pandas.Series.keys,../reference/api/pandas.Series.keys
10871080
generated/pandas.Series.kurt,../reference/api/pandas.Series.kurt
10881081
generated/pandas.Series.kurtosis,../reference/api/pandas.Series.kurtosis

doc/source/reference/frame.rst

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ Indexing, iteration
6363
DataFrame.insert
6464
DataFrame.__iter__
6565
DataFrame.items
66-
DataFrame.iteritems
6766
DataFrame.keys
6867
DataFrame.iterrows
6968
DataFrame.itertuples

doc/source/reference/indexing.rst

-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ Conversion
110110
Index.map
111111
Index.ravel
112112
Index.to_list
113-
Index.to_native_types
114113
Index.to_series
115114
Index.to_frame
116115
Index.view
@@ -393,7 +392,6 @@ Conversion
393392
:toctree: api/
394393

395394
DatetimeIndex.to_period
396-
DatetimeIndex.to_perioddelta
397395
DatetimeIndex.to_pydatetime
398396
DatetimeIndex.to_series
399397
DatetimeIndex.to_frame

0 commit comments

Comments
 (0)