Merge remote-tracking branch 'upstream/master' into move-metadata-to-cfg

Author: fangchenli

doc/source/_static/css/pandas.css

@@ -1,3 +1,10 @@
+/* Override some aspects of the pydata-sphinx-theme */
+
+:root {
+  /* Use softer blue from bootstrap's default info color */
+  --color-info: 23, 162, 184;
+}
+
 /* Getting started index page */
 
 .intro-card {

doc/source/whatsnew/v1.2.1.rst

@@ -15,6 +15,7 @@ including other versions of pandas.
 Fixed regressions
 ~~~~~~~~~~~~~~~~~
 - Fixed regression in :meth:`~DataFrame.to_csv` that created corrupted zip files when there were more rows than ``chunksize`` (:issue:`38714`)
+- Fixed regression in :meth:`~DataFrame.to_csv` opening ``codecs.StreamReaderWriter`` in binary mode instead of in text mode (:issue:`39247`)
 - Fixed regression in :meth:`read_csv` and other read functions were the encoding error policy (``errors``) did not default to ``"replace"`` when no encoding was specified (:issue:`38989`)
 - Fixed regression in :func:`read_excel` with non-rawbyte file handles (:issue:`38788`)
 - Fixed regression in :meth:`DataFrame.to_stata` not removing the created file when an error occured (:issue:`39202`)
@@ -31,6 +32,7 @@ Fixed regressions
 - Fixed regression in :meth:`DataFrame.replace` raising ``ValueError`` when :class:`DataFrame` has dtype ``bytes`` (:issue:`38900`)
 - Fixed regression in :meth:`Series.fillna` that raised ``RecursionError`` with ``datetime64[ns, UTC]`` dtype (:issue:`38851`)
 - Fixed regression in comparisons between ``NaT`` and ``datetime.date`` objects incorrectly returning ``True`` (:issue:`39151`)
+- Fixed regression in calling NumPy :func:`~numpy.ufunc.accumulate` ufuncs on DataFrames, e.g. ``np.maximum.accumulate(df)`` (:issue:`39259`)
 - Fixed regression in repr of float-like strings of an ``object`` dtype having trailing 0's truncated after the decimal (:issue:`38708`)
 - Fixed regression that raised ``AttributeError`` with PyArrow versions [0.16.0, 1.0.0) (:issue:`38801`)
 - Fixed regression in :func:`pandas.testing.assert_frame_equal` raising ``TypeError`` with ``check_like=True`` when :class:`Index` or columns have mixed dtype (:issue:`39168`)

doc/source/whatsnew/v1.3.0.rst

@@ -194,6 +194,7 @@ Deprecations
 - Deprecated comparison of :class:`Timestamp` object with ``datetime.date`` objects.  Instead of e.g. ``ts <= mydate`` use ``ts <= pd.Timestamp(mydate)`` or ``ts.date() <= mydate`` (:issue:`36131`)
 - Deprecated :attr:`Rolling.win_type` returning ``"freq"`` (:issue:`38963`)
 - Deprecated :attr:`Rolling.is_datetimelike` (:issue:`38963`)
+- Deprecated :meth:`core.window.ewm.ExponentialMovingWindow.vol` (:issue:`39220`)
 -
 
 .. ---------------------------------------------------------------------------

pandas/core/arraylike.py

@@ -274,8 +274,14 @@ def reconstruct(result):
         result = getattr(ufunc, method)(*inputs, **kwargs)
     else:
         # ufunc(dataframe)
-        mgr = inputs[0]._mgr
-        result = mgr.apply(getattr(ufunc, method))
+        if method == "__call__":
+            # for np.<ufunc>(..) calls
+            mgr = inputs[0]._mgr
+            result = mgr.apply(getattr(ufunc, method))
+        else:
+            # otherwise specific ufunc methods (eg np.<ufunc>.accumulate(..))
+            # Those can have an axis keyword and thus can't be called block-by-block
+            result = getattr(ufunc, method)(np.asarray(inputs[0]), **kwargs)
 
     if ufunc.nout > 1:  # type: ignore[attr-defined]
         result = tuple(reconstruct(x) for x in result)

pandas/core/computation/expr.py

@@ -558,19 +558,19 @@ def visit_Index(self, node, **kwargs):
         return self.visit(node.value)
 
     def visit_Subscript(self, node, **kwargs):
-        import pandas as pd
+        from pandas import eval as pd_eval
 
         value = self.visit(node.value)
         slobj = self.visit(node.slice)
-        result = pd.eval(
+        result = pd_eval(
             slobj, local_dict=self.env, engine=self.engine, parser=self.parser
         )
         try:
             # a Term instance
             v = value.value[result]
         except AttributeError:
             # an Op instance
-            lhs = pd.eval(
+            lhs = pd_eval(
                 value, local_dict=self.env, engine=self.engine, parser=self.parser
             )
             v = lhs[result]

pandas/core/computation/pytables.py

@@ -12,13 +12,13 @@
 
 from pandas.core.dtypes.common import is_list_like
 
-import pandas as pd
 import pandas.core.common as com
 from pandas.core.computation import expr, ops, scope as _scope
 from pandas.core.computation.common import ensure_decoded
 from pandas.core.computation.expr import BaseExprVisitor
 from pandas.core.computation.ops import UndefinedVariableError, is_term
 from pandas.core.construction import extract_array
+from pandas.core.indexes.base import Index
 
 from pandas.io.formats.printing import pprint_thing, pprint_thing_encoded
 
@@ -250,7 +250,7 @@ def convert_values(self):
 
 
 class FilterBinOp(BinOp):
-    filter: Optional[Tuple[Any, Any, pd.Index]] = None
+    filter: Optional[Tuple[Any, Any, Index]] = None
 
     def __repr__(self) -> str:
         if self.filter is None:
@@ -285,7 +285,7 @@ def evaluate(self):
             if self.op in ["==", "!="] and len(values) > self._max_selectors:
 
                 filter_op = self.generate_filter_op()
-                self.filter = (self.lhs, filter_op, pd.Index(values))
+                self.filter = (self.lhs, filter_op, Index(values))
 
                 return self
             return None
@@ -294,7 +294,7 @@ def evaluate(self):
         if self.op in ["==", "!="]:
 
             filter_op = self.generate_filter_op()
-            self.filter = (self.lhs, filter_op, pd.Index(values))
+            self.filter = (self.lhs, filter_op, Index(values))
 
         else:
             raise TypeError(

pandas/core/generic.py

@@ -8935,9 +8935,7 @@ def _where(
             # reconstruct the block manager
 
             self._check_inplace_setting(other)
-            new_data = self._mgr.putmask(
-                mask=cond, new=other, align=align, axis=block_axis
-            )
+            new_data = self._mgr.putmask(mask=cond, new=other, align=align)
             result = self._constructor(new_data)
             return self._update_inplace(result)
 

pandas/core/internals/__init__.py

@@ -2,14 +2,12 @@
 from pandas.core.internals.base import DataManager
 from pandas.core.internals.blocks import (  # io.pytables, io.packers
     Block,
-    BoolBlock,
     CategoricalBlock,
-    ComplexBlock,
     DatetimeBlock,
     DatetimeTZBlock,
     ExtensionBlock,
     FloatBlock,
-    IntBlock,
+    NumericBlock,
     ObjectBlock,
     TimeDeltaBlock,
     make_block,
@@ -25,14 +23,12 @@
 
 __all__ = [
     "Block",
-    "BoolBlock",
     "CategoricalBlock",
-    "ComplexBlock",
+    "NumericBlock",
     "DatetimeBlock",
     "DatetimeTZBlock",
     "ExtensionBlock",
     "FloatBlock",
-    "IntBlock",
     "ObjectBlock",
     "TimeDeltaBlock",
     "safe_reshape",

pandas/core/internals/array_manager.py

@@ -343,7 +343,7 @@ def where(self, other, cond, align: bool, errors: str, axis: int) -> ArrayManage
     # def setitem(self, indexer, value) -> ArrayManager:
     #     return self.apply_with_block("setitem", indexer=indexer, value=value)
 
-    def putmask(self, mask, new, align: bool = True, axis: int = 0):
+    def putmask(self, mask, new, align: bool = True):
 
         if align:
             align_keys = ["new", "mask"]
@@ -356,7 +356,6 @@ def putmask(self, mask, new, align: bool = True, axis: int = 0):
             align_keys=align_keys,
             mask=mask,
             new=new,
-            axis=axis,
         )
 
     def diff(self, n: int, axis: int) -> ArrayManager:

pandas/core/internals/blocks.py

@@ -100,8 +100,6 @@ class Block(PandasObject):
     __slots__ = ["_mgr_locs", "values", "ndim"]
     is_numeric = False
     is_float = False
-    is_integer = False
-    is_complex = False
     is_datetime = False
     is_datetimetz = False
     is_timedelta = False
@@ -998,7 +996,7 @@ def setitem(self, indexer, value):
         block = self.make_block(values)
         return block
 
-    def putmask(self, mask, new, axis: int = 0) -> List["Block"]:
+    def putmask(self, mask, new) -> List["Block"]:
         """
         putmask the data to the block; it is possible that we may create a
         new dtype of block
@@ -1009,7 +1007,6 @@ def putmask(self, mask, new, axis: int = 0) -> List["Block"]:
         ----------
         mask : np.ndarray[bool], SparseArray[bool], or BooleanArray
         new : a ndarray/object
-        axis : int
 
         Returns
         -------
@@ -1026,8 +1023,6 @@ def putmask(self, mask, new, axis: int = 0) -> List["Block"]:
             new = self.fill_value
 
         if self._can_hold_element(new):
-            # We only get here for non-Extension Blocks, so _try_coerce_args
-            #  is only relevant for DatetimeBlock and TimedeltaBlock
             if self.dtype.kind in ["m", "M"]:
                 arr = self.array_values()
                 arr = cast("NDArrayBackedExtensionArray", arr)
@@ -1040,14 +1035,17 @@ def putmask(self, mask, new, axis: int = 0) -> List["Block"]:
                 new_values = new_values.T
 
             putmask_without_repeat(new_values, mask, new)
+            return [self]
+
+        elif not mask.any():
+            return [self]
 
-        # maybe upcast me
-        elif mask.any():
+        else:
+            # may need to upcast
             if transpose:
                 mask = mask.T
                 if isinstance(new, np.ndarray):
                     new = new.T
-                axis = new_values.ndim - axis - 1
 
             # operate column-by-column
             def f(mask, val, idx):
@@ -1074,8 +1072,6 @@ def f(mask, val, idx):
             new_blocks = self.split_and_operate(mask, f, True)
             return new_blocks
 
-        return [self]
-
     def coerce_to_target_dtype(self, other):
         """
         coerce the current block to a dtype compat for other
@@ -1195,7 +1191,7 @@ def _interpolate(
 
         # only deal with floats
         if not self.is_float:
-            if not self.is_integer:
+            if self.dtype.kind not in ["i", "u"]:
                 return [self]
             data = data.astype(np.float64)
 
@@ -1316,7 +1312,7 @@ def where(self, other, cond, errors="raise", axis: int = 0) -> List["Block"]:
             # see if we can operate on the entire block, or need item-by-item
             # or if we are a single block (ndim == 1)
             if (
-                (self.is_integer or self.is_bool)
+                (self.dtype.kind in ["b", "i", "u"])
                 and lib.is_float(other)
                 and np.isnan(other)
             ):
@@ -1332,7 +1328,7 @@ def where(self, other, cond, errors="raise", axis: int = 0) -> List["Block"]:
                 return self._maybe_downcast(blocks, "infer")
 
             if not (
-                (self.is_integer or self.is_bool)
+                (self.dtype.kind in ["b", "i", "u"])
                 and lib.is_float(other)
                 and np.isnan(other)
             ):
@@ -1577,7 +1573,7 @@ def set_inplace(self, locs, values):
         assert locs.tolist() == [0]
         self.values = values
 
-    def putmask(self, mask, new, axis: int = 0) -> List["Block"]:
+    def putmask(self, mask, new) -> List["Block"]:
         """
         See Block.putmask.__doc__
         """
@@ -1912,11 +1908,18 @@ def external_values(self):
 class NumericBlock(Block):
     __slots__ = ()
     is_numeric = True
-    _can_hold_na = True
 
     def _can_hold_element(self, element: Any) -> bool:
         return can_hold_element(self.dtype, element)
 
+    @property
+    def _can_hold_na(self):
+        return self.dtype.kind not in ["b", "i", "u"]
+
+    @property
+    def is_bool(self):
+        return self.dtype.kind == "b"
+
 
 class FloatBlock(NumericBlock):
     __slots__ = ()
@@ -1956,17 +1959,6 @@ def to_native_types(
         return self.make_block(res)
 
 
-class ComplexBlock(NumericBlock):
-    __slots__ = ()
-    is_complex = True
-
-
-class IntBlock(NumericBlock):
-    __slots__ = ()
-    is_integer = True
-    _can_hold_na = False
-
-
 class DatetimeLikeBlockMixin(HybridMixin, Block):
     """Mixin class for DatetimeBlock, DatetimeTZBlock, and TimedeltaBlock."""
 
@@ -2232,7 +2224,7 @@ def _check_ndim(self, values, ndim):
         return ndim
 
 
-class TimeDeltaBlock(DatetimeLikeBlockMixin, IntBlock):
+class TimeDeltaBlock(DatetimeLikeBlockMixin):
     __slots__ = ()
     is_timedelta = True
     _can_hold_na = True
@@ -2269,12 +2261,6 @@ def fillna(self, value, **kwargs):
         return super().fillna(value, **kwargs)
 
 
-class BoolBlock(NumericBlock):
-    __slots__ = ()
-    is_bool = True
-    _can_hold_na = False
-
-
 class ObjectBlock(Block):
     __slots__ = ()
     is_object = True
@@ -2477,12 +2463,8 @@ def get_block_type(values, dtype: Optional[Dtype] = None):
         cls = TimeDeltaBlock
     elif kind == "f":
         cls = FloatBlock
-    elif kind == "c":
-        cls = ComplexBlock
-    elif kind == "i" or kind == "u":
-        cls = IntBlock
-    elif kind == "b":
-        cls = BoolBlock
+    elif kind in ["c", "i", "u", "b"]:
+        cls = NumericBlock
     else:
         cls = ObjectBlock
     return cls