Skip to content

Commit 5957fc0

Browse files
committed
Adjust base.py after the review
1 parent af12a53 commit 5957fc0

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

pandas/core/arrays/base.py

+22
Original file line numberDiff line numberDiff line change
@@ -1062,6 +1062,7 @@ def interpolate(
10621062
Interpolating values in a NumPy array:
10631063
10641064
>>> arr = pd.arrays.NumpyExtensionArray(np.array([0, 1, np.nan, 3]))
1065+
<<<<<<< HEAD
10651066
>>> arr.interpolate(
10661067
... method="linear",
10671068
<<<<<<< HEAD
@@ -1080,6 +1081,8 @@ def interpolate(
10801081
Interpolating values in a FloatingArray:
10811082
10821083
>>> arr = pd.array([1.0, pd.NA, 3.0, 4.0, pd.NA, 6.0], dtype="Float64")
1084+
=======
1085+
>>>>>>> 1e7c5d679b (Adjust base.py after the review)
10831086
>>> arr.interpolate(
10841087
... method="linear",
10851088
... axis=0,
@@ -1095,6 +1098,25 @@ def interpolate(
10951098
... limit_area=None,
10961099
... copy=True,
10971100
... )
1101+
<<<<<<< HEAD
1102+
=======
1103+
<NumpyExtensionArray>
1104+
[0.0, 1.0, 2.0, 3.0]
1105+
Length: 4, dtype: float64
1106+
1107+
Interpolating values in a FloatingArray:
1108+
1109+
>>> arr = pd.array([1.0, pd.NA, 3.0, 4.0, pd.NA, 6.0], dtype="Float64")
1110+
>>> arr.interpolate(
1111+
... method="linear",
1112+
... axis=0,
1113+
... index=pd.Index(range(len(arr))),
1114+
... limit=None,
1115+
... limit_direction="both",
1116+
... limit_area=None,
1117+
... copy=True,
1118+
... )
1119+
>>>>>>> 1e7c5d679b (Adjust base.py after the review)
10981120
<FloatingArray>
10991121
[1.0, 2.0, 3.0, 4.0, 5.0, 6.0]
11001122
Length: 6, dtype: Float64

0 commit comments

Comments
 (0)