Merge remote-tracking branch 'upstream/main' into scalars-interval

Kevin Sheppard · Kevin Sheppard · commit f730f5c09070 · 2022-11-09T00:00:00.000Z
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
     hooks:
     -   id: isort
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v3.2.0
     hooks:
     -   id: pyupgrade
         types_or: [python, pyi]
@@ -27,7 +27,7 @@ repos:
     -   id: flake8
         name: flake8 (pyi)
         additional_dependencies:
-        - flake8-pyi==22.8.2
+        - flake8-pyi==22.10.0
         types: [pyi]
         args: [
           --ignore=E301 E302 E305 E402 E501 E701 E704 F401 F811 W503 Y019 Y027 Y034 Y037 Y041 Y042,
diff --git a/pandas-stubs/_testing/__init__.pyi b/pandas-stubs/_testing/__init__.pyi
@@ -74,7 +74,7 @@ def assert_series_equal(
     obj: str = ...,
     *,
     check_index: Literal[False],
-    check_like: Literal[False],
+    check_like: Literal[False] = ...,
 ) -> None: ...
 @overload
 def assert_series_equal(
diff --git a/pandas-stubs/core/base.pyi b/pandas-stubs/core/base.pyi
@@ -63,6 +63,7 @@ class IndexOpsMixin:
     def tolist(self) -> list: ...
     def to_list(self) -> list: ...
     def __iter__(self): ...
+    @property
     def hasnans(self) -> bool: ...
     def value_counts(
         self,
diff --git a/pandas-stubs/core/frame.pyi b/pandas-stubs/core/frame.pyi
@@ -1276,8 +1276,6 @@ class DataFrame(NDFrame, OpsMixin):
     @property
     def at(self): ...  # Not sure what to do with this yet; look at source
     @property
-    def bool(self) -> _bool: ...
-    @property
     def columns(self) -> Index: ...
     @columns.setter  # setter needs to be right next to getter; otherwise mypy complains
     def columns(
@@ -1359,7 +1357,7 @@ class DataFrame(NDFrame, OpsMixin):
     ) -> DataFrame: ...
     def astype(
         self,
-        dtype: _str | Dtype | dict[_str, _str | Dtype],
+        dtype: _str | Dtype | dict[_str, _str | Dtype] | Series,
         copy: _bool = ...,
         errors: _str = ...,
     ) -> DataFrame: ...
diff --git a/pandas-stubs/core/generic.pyi b/pandas-stubs/core/generic.pyi
@@ -8,6 +8,7 @@ from typing import (
     Literal,
     Mapping,
     Sequence,
+    final,
     overload,
 )
 
@@ -83,6 +84,7 @@ class NDFrame(PandasObject, indexing.IndexingMixin):
     def __neg__(self: NDFrameT) -> NDFrameT: ...
     def __pos__(self: NDFrameT) -> NDFrameT: ...
     def __nonzero__(self) -> None: ...
+    @final
     def bool(self) -> _bool: ...
     def __abs__(self) -> NDFrame: ...
     def __round__(self, decimals: int = ...) -> NDFrame: ...
diff --git a/pandas-stubs/core/groupby/ops.pyi b/pandas-stubs/core/groupby/ops.pyi
@@ -70,6 +70,7 @@ class BinGrouper(BaseGrouper):
     def get_iterator(self, data: DataFrame | Series, axis: int = ...): ...
     def indices(self): ...
     def group_info(self): ...
+    @property
     def reconstructed_codes(self) -> list[np.ndarray]: ...
     def result_index(self): ...
     @property
diff --git a/pandas-stubs/core/indexes/base.pyi b/pandas-stubs/core/indexes/base.pyi
@@ -112,6 +112,7 @@ class Index(IndexOpsMixin, PandasObject):
     def is_monotonic_increasing(self) -> bool: ...
     @property
     def is_monotonic_decreasing(self) -> bool: ...
+    @property
     def is_unique(self) -> bool: ...
     @property
     def has_duplicates(self) -> bool: ...
@@ -124,9 +125,10 @@ class Index(IndexOpsMixin, PandasObject):
     def is_interval(self) -> bool: ...
     def is_mixed(self) -> bool: ...
     def holds_integer(self): ...
+    @property
     def inferred_type(self): ...
-    def is_all_dates(self) -> bool: ...
     def __reduce__(self): ...
+    @property
     def hasnans(self) -> bool: ...
     def isna(self): ...
     isnull = ...
@@ -177,6 +179,7 @@ class Index(IndexOpsMixin, PandasObject):
     ): ...
     @property
     def values(self) -> np.ndarray: ...
+    @property
     def array(self) -> ExtensionArray: ...
     def memory_usage(self, deep: bool = ...): ...
     def where(self, cond, other=...): ...
diff --git a/pandas-stubs/core/indexes/category.pyi b/pandas-stubs/core/indexes/category.pyi
@@ -28,6 +28,7 @@ class CategoricalIndex(ExtensionIndex, accessor.PandasDelegate):
     def __array__(self, dtype=...) -> np.ndarray: ...
     def astype(self, dtype: DtypeArg, copy: bool = ...) -> Index: ...
     def fillna(self, value=..., downcast=...): ...
+    @property
     def is_unique(self) -> bool: ...
     @property
     def is_monotonic_increasing(self) -> bool: ...
diff --git a/pandas-stubs/core/indexes/multi.pyi b/pandas-stubs/core/indexes/multi.pyi
@@ -65,8 +65,10 @@ class MultiIndex(Index):
     def __array__(self, dtype=...) -> np.ndarray: ...
     def view(self, cls=...): ...
     def __contains__(self, key) -> bool: ...
+    @property
     def dtype(self) -> np.dtype: ...
     def memory_usage(self, deep: bool = ...) -> int: ...
+    @property
     def nbytes(self) -> int: ...
     def format(
         self,
@@ -82,7 +84,9 @@ class MultiIndex(Index):
     def inferred_type(self) -> str: ...
     @property
     def values(self): ...
+    @property
     def is_monotonic_increasing(self) -> bool: ...
+    @property
     def is_monotonic_decreasing(self) -> bool: ...
     def duplicated(self, keep: Literal["first", "last", False] = ...): ...
     def fillna(self, value=..., downcast=...) -> None: ...
diff --git a/pandas-stubs/core/indexes/numeric.pyi b/pandas-stubs/core/indexes/numeric.pyi
@@ -37,5 +37,6 @@ class Float64Index(NumericIndex):
     def equals(self, other) -> bool: ...
     def __contains__(self, other) -> bool: ...
     def get_loc(self, key, tolerance=...): ...
+    @property
     def is_unique(self) -> bool: ...
     def isin(self, values, level=...): ...
diff --git a/pandas-stubs/core/indexes/range.pyi b/pandas-stubs/core/indexes/range.pyi
@@ -32,13 +32,16 @@ class RangeIndex(Int64Index):
     def start(self): ...
     def stop(self): ...
     def step(self): ...
+    @property
     def nbytes(self) -> int: ...
     def memory_usage(self, deep: bool = ...) -> int: ...
     @property
     def dtype(self) -> np.dtype: ...
     @property
     def is_unique(self) -> bool: ...
+    @property
     def is_monotonic_increasing(self) -> bool: ...
+    @property
     def is_monotonic_decreasing(self) -> bool: ...
     @property
     def has_duplicates(self) -> bool: ...
diff --git a/pandas-stubs/core/series.pyi b/pandas-stubs/core/series.pyi
@@ -467,8 +467,9 @@ class Series(IndexOpsMixin, NDFrame, Generic[S1]):
         observed: _bool = ...,
         dropna: _bool = ...,
     ) -> _SeriesGroupByNonScalar[S1]: ...
+    # need the ignore because None is Hashable
     @overload
-    def count(self, level: None = ...) -> int: ...
+    def count(self, level: None = ...) -> int: ...  # type: ignore[misc]
     @overload
     def count(self, level: Hashable) -> Series[S1]: ...
     def mode(self, dropna=...) -> Series[S1]: ...
diff --git a/pandas-stubs/util/version/__init__.pyi b/pandas-stubs/util/version/__init__.pyi
@@ -0,0 +1,65 @@
+def parse(version: str) -> LegacyVersion | Version: ...
+
+class _BaseVersion:
+    def __lt__(self, other: _BaseVersion) -> bool: ...
+    def __le__(self, other: _BaseVersion) -> bool: ...
+    def __eq__(self, other: object) -> bool: ...
+    def __ge__(self, other: _BaseVersion) -> bool: ...
+    def __gt__(self, other: _BaseVersion) -> bool: ...
+    def __ne__(self, other: object) -> bool: ...
+
+class LegacyVersion(_BaseVersion):
+    def __init__(self, version: str) -> None: ...
+    @property
+    def public(self) -> str: ...
+    @property
+    def base_version(self) -> str: ...
+    @property
+    def epoch(self) -> int: ...
+    @property
+    def release(self) -> None: ...
+    @property
+    def pre(self) -> None: ...
+    @property
+    def post(self) -> None: ...
+    @property
+    def dev(self) -> None: ...
+    @property
+    def local(self) -> None: ...
+    @property
+    def is_prerelease(self) -> bool: ...
+    @property
+    def is_postrelease(self) -> bool: ...
+    @property
+    def is_devrelease(self) -> bool: ...
+
+class Version(_BaseVersion):
+    def __init__(self, version: str) -> None: ...
+    @property
+    def epoch(self) -> int: ...
+    @property
+    def release(self) -> tuple[int, ...]: ...
+    @property
+    def pre(self) -> tuple[str, int] | None: ...
+    @property
+    def post(self) -> int | None: ...
+    @property
+    def dev(self) -> int | None: ...
+    @property
+    def local(self) -> str | None: ...
+    @property
+    def public(self) -> str: ...
+    @property
+    def base_version(self) -> str: ...
+    @property
+    def is_prerelease(self) -> bool: ...
+    @property
+    def is_postrelease(self) -> bool: ...
+    @property
+    def is_devrelease(self) -> bool: ...
+    @property
+    def major(self) -> int: ...
+    @property
+    def minor(self) -> int: ...
+    @property
+    def micro(self) -> int: ...
diff --git a/pyproject.toml b/pyproject.toml
@@ -34,7 +34,7 @@ python = ">=3.8,<3.11"
 types-pytz = ">= 2022.1.1"
 
 [tool.poetry.dev-dependencies]
-mypy = "==0.971"
+mypy = "==0.990"
 pyarrow = ">=9.0.0"
 pytest = ">=7.1.2"
 pyright = ">=1.1.278"
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,16 +1,25 @@
 from __future__ import annotations
 
+from contextlib import (
+    AbstractContextManager,
+    nullcontext,
+)
 import os
 import platform
 from typing import (
     TYPE_CHECKING,
     Final,
 )
 
+import pandas as pd
+from pandas.util.version import Version
+import pytest
+
 from pandas._typing import T
 
 TYPE_CHECKING_INVALID_USAGE: Final = TYPE_CHECKING
 WINDOWS = os.name == "nt" or "cygwin" in platform.system().lower()
+PD_LTE_15 = Version(pd.__version__) < Version("1.5.999")
 
 
 def check(actual: T, klass: type, dtype: type | None = None, attr: str = "left") -> T:
@@ -20,11 +29,67 @@ def check(actual: T, klass: type, dtype: type | None = None, attr: str = "left")
         return actual  # type: ignore[return-value]
 
     if hasattr(actual, "__iter__"):
-        value = next(iter(actual))  # type: ignore[call-overload]
+        value = next(iter(actual))  # pyright: ignore[reportGeneralTypeIssues]
     else:
         assert hasattr(actual, attr)
         value = getattr(actual, attr)
 
     if not isinstance(value, dtype):
         raise RuntimeError(f"Expected type '{dtype}' but got '{type(value)}'")
     return actual  # type: ignore[return-value]
+
+
+def pytest_warns_bounded(
+    warning: type[Warning],
+    match: str,
+    lower: str | None = None,
+    upper: str | None = None,
+) -> AbstractContextManager:
+    """
+    Version conditional pytest.warns context manager
+
+    Returns a context manager that will raise an error if
+    the warning is not issued when pandas version is
+    between the lower and upper version given.
+
+    Parameters
+    ----------
+    warning : type[Warning]
+        The warning class to check for.
+    match : str
+        The string to match in the warning message.
+    lower : str, optional
+        The lower bound of the version to check for the warning.
+    upper : str, optional
+        The upper bound of the version to check for the warning.
+
+    Notes
+    -----
+    The lower and upper bounds are exclusive so that a pytest.warns context
+    manager is returned if lower < pd.__version__ < upper.
+
+    Examples
+    --------
+    with pytest_warns_bounded(UserWarning, match="foo", lower="1.2.99"):
+        # Versions 1.3.0 and above will raise an error
+        # if the warning is not issued
+        pass
+
+    with pytest_warns_bounded(UserWarning, match="foo", upper="1.5.99"):
+        # Versions 1.6.0 and below will raise an error
+        # if the warning is not issued
+        pass
+
+    with pytest_warns_bounded(
+        UserWarning, match="foo", lower="1.2.99", upper="1.5.99"
+    ):
+        # Versions between 1.3.x and 1.5.x will raise an error
+        pass
+    """
+    lb = Version("0.0.0") if lower is None else Version(lower)
+    ub = Version("9999.0.0") if upper is None else Version(upper)
+    current = Version(pd.__version__)
+    if lb < current < ub:
+        return pytest.warns(warning, match=match)
+    else:
+        return nullcontext()
diff --git a/tests/test_frame.py b/tests/test_frame.py
@@ -36,8 +36,10 @@
 from pandas._typing import Scalar
 
 from tests import (
+    PD_LTE_15,
     TYPE_CHECKING_INVALID_USAGE,
     check,
+    pytest_warns_bounded,
 )
 
 from pandas.io.formats.style import Styler
@@ -933,12 +935,16 @@ def test_types_describe() -> None:
         }
     )
     df.describe()
-    with pytest.warns(FutureWarning, match="Treating datetime data as categorical"):
+    with pytest_warns_bounded(
+        FutureWarning, match="Treating datetime data as categorical", upper="1.5.999"
+    ):
         df.describe(percentiles=[0.5], include="all")
-    with pytest.warns(FutureWarning, match="Treating datetime data as categorical"):
         df.describe(exclude=[np.number])
-    # datetime_is_numeric param added in 1.1.0 https://pandas.pydata.org/docs/whatsnew/v1.1.0.html
-    df.describe(datetime_is_numeric=True)
+    if PD_LTE_15:
+        # datetime_is_numeric param added in 1.1.0
+        # https://pandas.pydata.org/docs/whatsnew/v1.1.0.html
+        # Remove in 2.0.0
+        df.describe(datetime_is_numeric=True)
 
 
 def test_types_to_string() -> None:
@@ -1921,3 +1927,9 @@ def df_accepting_dicts_iterator() -> None:
     # GH 392
     data = [{"a": 1, "b": 2}, {"a": 3, "b": 5}]
     check(assert_type(pd.DataFrame(iter(data)), pd.DataFrame), pd.DataFrame)
+
+
+def series_added_in_astype() -> None:
+    # GH410
+    df = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
+    check(assert_type(df.astype(df.dtypes), pd.DataFrame), pd.DataFrame)
diff --git a/tests/test_io.py b/tests/test_io.py
diff --git a/tests/test_series.py b/tests/test_series.py
diff --git a/tests/test_testing.py b/tests/test_testing.py
