Merge branch 'master' of github.com:pandas-dev/pandas into subplot_groups

Author: NicolasHug

doc/source/whatsnew/v1.2.1.rst

@@ -1,6 +1,6 @@
 .. _whatsnew_121:
 
-What's new in 1.2.1 (January ??, 2021)
+What's new in 1.2.1 (January 18, 2021)
 --------------------------------------
 
 These are the changes in pandas 1.2.1. See :ref:`release` for a full changelog
@@ -33,6 +33,7 @@ Fixed regressions
 - Fixed regression in :meth:`DataFrame.groupby` when aggregating an :class:`ExtensionDType` that could fail for non-numeric values (:issue:`38980`)
 - Fixed regression in :meth:`DataFrame.loc.__setitem__` raising ``KeyError`` with :class:`MultiIndex` and list-like columns indexer enlarging :class:`DataFrame` (:issue:`39147`)
 - Fixed regression in comparisons between ``NaT`` and ``datetime.date`` objects incorrectly returning ``True`` (:issue:`39151`)
+- Fixed regression in :func:`pandas.testing.assert_index_equal` raising ``TypeError`` with ``check_order=False`` when :class:`Index` has mixed dtype (:issue:`39168`)
 
 .. ---------------------------------------------------------------------------
 
@@ -43,7 +44,6 @@ Bug fixes
 
 - Bug in :meth:`read_csv` with ``float_precision="high"`` caused segfault or wrong parsing of long exponent strings. This resulted in a regression in some cases as the default for ``float_precision`` was changed in pandas 1.2.0 (:issue:`38753`)
 - Bug in :func:`read_csv` not closing an opened file handle when a ``csv.Error`` or ``UnicodeDecodeError`` occurred while initializing (:issue:`39024`)
-- Bug in :func:`pandas.testing.assert_index_equal` raising ``TypeError`` with ``check_order=False`` when :class:`Index` has mixed dtype (:issue:`39168`)
 
 .. ---------------------------------------------------------------------------
 
@@ -57,8 +57,6 @@ Other
 - Bumped minimum pymysql version to 0.8.1 to avoid test failures (:issue:`38344`)
 - Fixed build failure on MacOS 11 in Python 3.9.1 (:issue:`38766`)
 - Added reference to backwards incompatible ``check_freq`` arg of :func:`testing.assert_frame_equal` and :func:`testing.assert_series_equal` in :ref:`pandas 1.1.0 whats new <whatsnew_110.api_breaking.testing.check_freq>` (:issue:`34050`)
--
--
 
 .. ---------------------------------------------------------------------------
 

pandas/core/generic.py

@@ -10587,8 +10587,10 @@ def all(self, axis=0, bool_only=None, skipna=True, level=None, **kwargs):
         # [assignment]
         cls.all = all  # type: ignore[assignment]
 
+        # error: Argument 1 to "doc" has incompatible type "Optional[str]"; expected
+        # "Union[str, Callable[..., Any]]"
         @doc(
-            NDFrame.mad,
+            NDFrame.mad.__doc__,  # type: ignore[arg-type]
             desc="Return the mean absolute deviation of the values "
             "over the requested axis.",
             name1=name1,

pandas/io/formats/style.py

@@ -222,7 +222,7 @@ def _init_tooltips(self):
         if self.tooltips is None:
             self.tooltips = _Tooltips()
 
-    def set_tooltips(self, ttips: DataFrame) -> "Styler":
+    def set_tooltips(self, ttips: DataFrame) -> Styler:
         """
         Add string based tooltips that will appear in the `Styler` HTML result. These
         tooltips are applicable only to`<td>` elements.
@@ -268,7 +268,7 @@ def set_tooltips_class(
         self,
         name: Optional[str] = None,
         properties: Optional[Sequence[Tuple[str, Union[str, int, float]]]] = None,
-    ) -> "Styler":
+    ) -> Styler:
         """
         Manually configure the name and/or properties of the class for
         creating tooltips on hover.