Merge remote-tracking branch 'upstream/main' into tst/unused_fixtures

Author: mroeschke

pandas/core/array_algos/putmask.py

@@ -12,6 +12,7 @@
     ArrayLike,
     npt,
 )
+from pandas.compat import np_version_under1p20
 
 from pandas.core.dtypes.cast import (
     can_hold_element,
@@ -126,7 +127,8 @@ def putmask_without_repeat(
     mask : np.ndarray[bool]
     new : Any
     """
-    new = setitem_datetimelike_compat(values, mask.sum(), new)
+    if np_version_under1p20:
+        new = setitem_datetimelike_compat(values, mask.sum(), new)
 
     if getattr(new, "ndim", 0) >= 1:
         new = new.astype(values.dtype, copy=False)

pandas/core/arrays/_mixins.py

@@ -180,15 +180,15 @@ def _values_for_argsort(self) -> np.ndarray:
     def argmin(self, axis: int = 0, skipna: bool = True):  # type:ignore[override]
         # override base class by adding axis keyword
         validate_bool_kwarg(skipna, "skipna")
-        if not skipna and self.isna().any():
+        if not skipna and self._hasna:
             raise NotImplementedError
         return nargminmax(self, "argmin", axis=axis)
 
     # Signature of "argmax" incompatible with supertype "ExtensionArray"
     def argmax(self, axis: int = 0, skipna: bool = True):  # type:ignore[override]
         # override base class by adding axis keyword
         validate_bool_kwarg(skipna, "skipna")
-        if not skipna and self.isna().any():
+        if not skipna and self._hasna:
             raise NotImplementedError
         return nargminmax(self, "argmax", axis=axis)
 

pandas/core/arrays/datetimes.py

@@ -2289,7 +2289,6 @@ def maybe_convert_dtype(data, copy: bool):
         copy = False
 
     elif is_extension_array_dtype(data.dtype) and not is_datetime64tz_dtype(data.dtype):
-        # Includes categorical
         # TODO: We have no tests for these
         data = np.array(data, dtype=np.object_)
         copy = False

pandas/core/internals/blocks.py

@@ -367,14 +367,16 @@ def iget(self, i: int | tuple[int, int] | tuple[slice, int]):
         # "Union[int, integer[Any]]"
         return self.values[i]  # type: ignore[index]
 
-    def set_inplace(self, locs, values) -> None:
+    def set_inplace(self, locs, values: ArrayLike) -> None:
         """
         Modify block values in-place with new item value.
 
         Notes
         -----
-        `set` never creates a new array or new Block, whereas `setitem` _may_
-        create a new array and always creates a new Block.
+        `set_inplace` never creates a new array or new Block, whereas `setitem`
+        _may_ create a new array and always creates a new Block.
+
+        Caller is responsible for checking values.dtype == self.dtype.
         """
         self.values[locs] = values
 
@@ -1181,7 +1183,7 @@ def where(self, other, cond) -> list[Block]:
         icond, noop = validate_putmask(values, ~cond)
         if noop:
             # GH-39595: Always return a copy; short-circuit up/downcasting
-            return self.copy()
+            return [self.copy()]
 
         if other is lib.no_default:
             other = self.fill_value
@@ -1373,7 +1375,8 @@ def setitem(self, indexer, value):
 
         values = self.values
         if values.ndim == 2:
-            # TODO: string[pyarrow] tests break if we transpose unconditionally
+            # TODO(GH#45419): string[pyarrow] tests break if we transpose
+            #  unconditionally
             values = values.T
         check_setitem_lengths(indexer, value, values)
         values[indexer] = value
@@ -1394,7 +1397,7 @@ def where(self, other, cond) -> list[Block]:
         if noop:
             # GH#44181, GH#45135
             # Avoid a) raising for Interval/PeriodDtype and b) unnecessary object upcast
-            return self.copy()
+            return [self.copy()]
 
         try:
             res_values = arr._where(cond, other).T
@@ -1596,12 +1599,16 @@ def iget(self, i: int | tuple[int, int] | tuple[slice, int]):
                 raise IndexError(f"{self} only contains one item")
             return self.values
 
-    def set_inplace(self, locs, values) -> None:
+    def set_inplace(self, locs, values: ArrayLike) -> None:
         # NB: This is a misnomer, is supposed to be inplace but is not,
         #  see GH#33457
         # When an ndarray, we should have locs.tolist() == [0]
         # When a BlockPlacement we should have list(locs) == [0]
-        self.values = values
+
+        # error: Incompatible types in assignment (expression has type
+        # "Union[ExtensionArray, ndarray[Any, Any]]", variable has type
+        # "ExtensionArray")
+        self.values = values  # type: ignore[assignment]
         try:
             # TODO(GH33457) this can be removed
             self._cache.clear()

pandas/core/reshape/api.py

@@ -1,6 +1,7 @@
 # flake8: noqa:F401
 
 from pandas.core.reshape.concat import concat
+from pandas.core.reshape.encoding import get_dummies
 from pandas.core.reshape.melt import (
     lreshape,
     melt,
@@ -16,7 +17,6 @@
     pivot,
     pivot_table,
 )
-from pandas.core.reshape.reshape import get_dummies
 from pandas.core.reshape.tile import (
     cut,
     qcut,