Skip to content

Commit 8058d9a

Browse files
fix tests
1 parent c6f37d1 commit 8058d9a

File tree

8 files changed

+10
-17
lines changed

8 files changed

+10
-17
lines changed

pandas/_libs/ops.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def vec_compare(ndarray[object] left, ndarray[object] right, object op) -> ndarr
177177

178178
@cython.wraparound(False)
179179
@cython.boundscheck(False)
180-
def scalar_binop(object[:] values, object val, object op) -> ndarray:
180+
def scalar_binop(ndarray[object] values, object val, object op) -> ndarray:
181181
"""
182182
Apply the given binary operator `op` between each element of the array
183183
`values` and the scalar `val`.
@@ -214,7 +214,7 @@ def scalar_binop(object[:] values, object val, object op) -> ndarray:
214214

215215
@cython.wraparound(False)
216216
@cython.boundscheck(False)
217-
def vec_binop(object[:] left, object[:] right, object op) -> ndarray:
217+
def vec_binop(ndarray[object] left, ndarray[object] right, object op) -> ndarray:
218218
"""
219219
Apply the given binary operator `op` pointwise to the elements of
220220
arrays `left` and `right`.

pandas/tests/arrays/integer/test_indexing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def test_array_setitem_nullable_boolean_mask():
1212

1313
def test_array_setitem():
1414
# GH 31446
15-
arr = pd.Series([1, 2], dtype="Int64").array
15+
arr = pd.array([1, 2], dtype="Int64")
1616
arr[arr > 1] = 1
1717

1818
expected = pd.array([1, 1], dtype="Int64")

pandas/tests/arrays/numpy_/test_numpy.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,6 @@ def test_to_numpy():
159159
# Setitem
160160

161161

162-
def test_setitem_series():
163-
ser = pd.Series([1, 2, 3])
164-
ser.array[0] = 10
165-
expected = pd.Series([10, 2, 3])
166-
tm.assert_series_equal(ser, expected)
167-
168-
169162
def test_setitem(any_numpy_array):
170163
nparr = any_numpy_array
171164
arr = NumpyExtensionArray(nparr, copy=True)

pandas/tests/arrays/test_datetimelike.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,8 +1248,8 @@ def test_invalid_nat_setitem_array(arr, non_casting_nats):
12481248
@pytest.mark.parametrize(
12491249
"arr",
12501250
[
1251-
pd.date_range("2000", periods=4).array,
1252-
pd.timedelta_range("2000", periods=4).array,
1251+
pd.date_range("2000", periods=4).array.copy(),
1252+
pd.timedelta_range("2000", periods=4).array.copy(),
12531253
],
12541254
)
12551255
def test_to_numpy_extra(arr):

pandas/tests/extension/test_common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,5 @@ def test_ellipsis_index():
101101
# String comparison because there's no native way to compare slices.
102102
# Before the fix for GH#42430, last_item_arg would get set to the 2D slice
103103
# (Ellipsis, slice(None, 1, None))
104-
out = df["col1"].array.last_item_arg
104+
out = df["col1"]._values.last_item_arg
105105
assert str(out) == "slice(None, 1, None)"

pandas/tests/extension/test_numpy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def allow_in_pandas(monkeypatch):
7777
@pytest.fixture
7878
def data(allow_in_pandas, dtype):
7979
if dtype.numpy_dtype == "object":
80-
return pd.Series([(i,) for i in range(100)]).array
80+
return pd.Series([(i,) for i in range(100)]).array.copy()
8181
return NumpyExtensionArray(np.arange(1, 101, dtype=dtype._dtype))
8282

8383

pandas/tests/internals/test_internals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ def check_series_setitem(self, elem, index: Index, inplace: bool):
13471347
ser[: len(elem)] = elem
13481348

13491349
if inplace:
1350-
assert ser.array is arr # i.e. setting was done inplace
1350+
assert ser._values is arr # i.e. setting was done inplace
13511351
else:
13521352
assert ser.dtype == object
13531353

pandas/tests/series/test_constructors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,9 +525,9 @@ def test_categorical_sideeffects_free(self):
525525
# so this WILL change values
526526
cat = Categorical(["a", "b", "c", "a"])
527527
s = Series(cat, copy=False)
528-
assert s.values is cat
528+
assert s._values is cat
529529
s = s.cat.rename_categories([1, 2, 3])
530-
assert s.values is not cat
530+
assert s._values is not cat
531531
exp_s = np.array([1, 2, 3, 1], dtype=np.int64)
532532
tm.assert_numpy_array_equal(s.__array__(), exp_s)
533533

0 commit comments

Comments
 (0)