CI: Unpin pytest

ci/deps/azure-36-32bit.yaml

@@ -23,4 +23,4 @@ dependencies:
   - pip
   - pip:
     - cython>=0.29.16
-    - pytest>=5.0.1,<6.0.0rc0
+    - pytest>=5.0.1

ci/deps/azure-36-locale.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.16
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - pytest-asyncio
   - hypothesis>=3.58.0

ci/deps/azure-36-locale_slow.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.16
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-azurepipelines

ci/deps/azure-36-slow.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.16
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
 

ci/deps/azure-37-locale.yaml

@@ -6,7 +6,7 @@ dependencies:
 
   # tools
   - cython>=0.29.16
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - pytest-asyncio
   - hypothesis>=3.58.0

ci/deps/azure-37-numpydev.yaml

@@ -5,7 +5,7 @@ dependencies:
   - python=3.7.*
 
   # tools
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-azurepipelines

ci/deps/azure-macos-36.yaml

@@ -5,7 +5,7 @@ dependencies:
   - python=3.6.*
 
   # tools
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-azurepipelines

ci/deps/azure-windows-36.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.16
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-azurepipelines

ci/deps/azure-windows-37.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.16
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-azurepipelines

ci/deps/travis-36-cov.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.16
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
   - pytest-cov  # this is only needed in the coverage build

ci/deps/travis-36-locale.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.16
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
 

ci/deps/travis-37-arm64.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.13
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
 

ci/deps/travis-37.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.16
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
 

ci/deps/travis-38.yaml

@@ -7,7 +7,7 @@ dependencies:
 
   # tools
   - cython>=0.29.16
-  - pytest>=5.0.1,<6.0.0rc0
+  - pytest>=5.0.1
   - pytest-xdist>=1.21
   - hypothesis>=3.58.0
 

environment.yml

@@ -51,10 +51,6 @@ dependencies:
   - botocore>=1.11
   - hypothesis>=3.82
   - moto  # mock S3
-  - pytest>=5.0.1,<6.0.0rc0
-  - pytest-cov
-  - pytest-xdist>=1.21
-  - pytest-asyncio
 
   # downstream tests
   - seaborn
@@ -108,3 +104,7 @@ dependencies:
   - pip:
     - git+https://github.com/pandas-dev/pydata-sphinx-theme.git@master
     - git+https://github.com/numpy/numpydoc
+    - git+https://github.com/pytest-dev/pytest@master
+    - pytest-cov
+    - pytest-xdist>=1.21
+    - pytest-asyncio

pandas/_testing.py

@@ -9,7 +9,7 @@
 from shutil import rmtree
 import string
 import tempfile
-from typing import Any, Callable, List, Optional, Type, Union, cast
+from typing import Any, Callable, ContextManager, List, Optional, Type, Union, cast
 import warnings
 import zipfile
 
@@ -2880,9 +2880,7 @@ def convert_rows_list_to_csv_str(rows_list: List[str]):
     return expected
 
 
-def external_error_raised(
-    expected_exception: Type[Exception],
-) -> Callable[[Type[Exception], None], None]:
+def external_error_raised(expected_exception: Type[Exception],) -> ContextManager:
     """
     Helper function to mark pytest.raises that have an external error message.
 

pandas/tests/arithmetic/test_numeric.py

@@ -99,7 +99,7 @@ class TestNumericArraylikeArithmeticWithDatetimeLike:
     # TODO: also check name retentention
     @pytest.mark.parametrize("box_cls", [np.array, pd.Index, pd.Series])
     @pytest.mark.parametrize(
-        "left", lefts, ids=lambda x: type(x).__name__ + str(x.dtype),
+        "left", lefts, ids=lambda x: type(x).__name__ + str(x.dtype)
     )
     def test_mul_td64arr(self, left, box_cls):
         # GH#22390
@@ -119,7 +119,7 @@ def test_mul_td64arr(self, left, box_cls):
     # TODO: also check name retentention
     @pytest.mark.parametrize("box_cls", [np.array, pd.Index, pd.Series])
     @pytest.mark.parametrize(
-        "left", lefts, ids=lambda x: type(x).__name__ + str(x.dtype),
+        "left", lefts, ids=lambda x: type(x).__name__ + str(x.dtype)
     )
     def test_div_td64arr(self, left, box_cls):
         # GH#22390

pandas/tests/groupby/test_categorical.py

@@ -1299,7 +1299,8 @@ def test_series_groupby_on_2_categoricals_unobserved(
 ):
     # GH 17605
     if reduction_func == "ngroup":
-        pytest.skip("ngroup is not truly a reduction")
+        # https://github.com/pytest-dev/pytest/issues/7495
+        pytest.skip("ngroup is not truly a reduction")  # type: ignore
 
     if reduction_func == "corrwith":  # GH 32293
         mark = pytest.mark.xfail(
@@ -1332,7 +1333,8 @@ def test_series_groupby_on_2_categoricals_unobserved_zeroes_or_nans(
     # Tests whether the unobserved categories in the result contain 0 or NaN
 
     if reduction_func == "ngroup":
-        pytest.skip("ngroup is not truly a reduction")
+        # https://github.com/pytest-dev/pytest/issues/7495
+        pytest.skip("ngroup is not truly a reduction")  # type: ignore
 
     if reduction_func == "corrwith":  # GH 32293
         mark = pytest.mark.xfail(
@@ -1380,7 +1382,8 @@ def test_dataframe_groupby_on_2_categoricals_when_observed_is_true(reduction_fun
     # Ensure that df.groupby, when 'by' is two pd.Categorical variables,
     # does not return the categories that are not in df when observed=True
     if reduction_func == "ngroup":
-        pytest.skip("ngroup does not return the Categories on the index")
+        # https://github.com/pytest-dev/pytest/issues/7495
+        pytest.skip("ngroup does not return the Categories on the index")  # type: ignore  # noqa: E501
 
     df = pd.DataFrame(
         {
@@ -1410,7 +1413,8 @@ def test_dataframe_groupby_on_2_categoricals_when_observed_is_false(
     # returns the categories that are not in df when observed=False/None
 
     if reduction_func == "ngroup":
-        pytest.skip("ngroup does not return the Categories on the index")
+        # https://github.com/pytest-dev/pytest/issues/7495
+        pytest.skip("ngroup does not return the Categories on the index")  # type: ignore  # noqa:E501
 
     if reduction_func == "count":  # GH 35028
         mark = pytest.mark.xfail(

pandas/util/_test_decorators.py

@@ -120,7 +120,9 @@ def _skip_if_no_scipy() -> bool:
     )
 
 
-def skip_if_installed(package: str) -> Callable:
+# TODO: return type, _pytest.mark.structures.MarkDecorator is not public
+# https://github.com/pytest-dev/pytest/issues/7469
+def skip_if_installed(package: str):
     """
     Skip a test if a package is installed.
 
@@ -134,7 +136,9 @@ def skip_if_installed(package: str) -> Callable:
     )
 
 
-def skip_if_no(package: str, min_version: Optional[str] = None) -> Callable:
+# TODO: return type, _pytest.mark.structures.MarkDecorator is not public
+# https://github.com/pytest-dev/pytest/issues/7469
+def skip_if_no(package: str, min_version: Optional[str] = None):
     """
     Generic function to help skip tests when required packages are not
     present on the testing system.
@@ -196,14 +200,12 @@ def skip_if_no(package: str, min_version: Optional[str] = None) -> Callable:
 )
 
 
-def skip_if_np_lt(
-    ver_str: str, reason: Optional[str] = None, *args, **kwds
-) -> Callable:
+# TODO: return type, _pytest.mark.structures.MarkDecorator is not public
+# https://github.com/pytest-dev/pytest/issues/7469
+def skip_if_np_lt(ver_str: str, *args, reason: Optional[str] = None):
     if reason is None:
         reason = f"NumPy {ver_str} or greater required"
-    return pytest.mark.skipif(
-        _np_version < LooseVersion(ver_str), reason=reason, *args, **kwds
-    )
+    return pytest.mark.skipif(_np_version < LooseVersion(ver_str), *args, reason=reason)
 
 
 def parametrize_fixture_doc(*args):

requirements-dev.txt

@@ -32,10 +32,6 @@ boto3
 botocore>=1.11
 hypothesis>=3.82
 moto
-pytest>=5.0.1,<6.0.0rc0
-pytest-cov
-pytest-xdist>=1.21
-pytest-asyncio
 seaborn
 statsmodels
 ipywidgets
@@ -73,4 +69,8 @@ cftime
 pyreadstat
 tabulate>=0.8.3
 git+https://github.com/pandas-dev/pydata-sphinx-theme.git@master
-git+https://github.com/numpy/numpydoc
+git+https://github.com/numpy/numpydoc
+git+https://github.com/pytest-dev/pytest@master
+pytest-cov
+pytest-xdist>=1.21
+pytest-asyncio

setup.cfg

@@ -105,7 +105,7 @@ known_dtypes = pandas.core.dtypes
 known_post_core = pandas.tseries,pandas.io,pandas.plotting
 sections = FUTURE,STDLIB,THIRDPARTY,PRE_LIBS,PRE_CORE,DTYPES,FIRSTPARTY,POST_CORE,LOCALFOLDER
 known_first_party = pandas
-known_third_party = _pytest,announce,dateutil,docutils,flake8,git,hypothesis,jinja2,lxml,matplotlib,numpy,numpydoc,pkg_resources,pyarrow,pytest,pytz,requests,scipy,setuptools,sphinx,sqlalchemy,validate_docstrings,validate_unwanted_patterns,yaml,odf
+known_third_party = announce,dateutil,docutils,flake8,git,hypothesis,jinja2,lxml,matplotlib,numpy,numpydoc,pkg_resources,pyarrow,pytest,pytz,requests,scipy,setuptools,sphinx,sqlalchemy,validate_docstrings,validate_unwanted_patterns,yaml,odf
 multi_line_output = 3
 include_trailing_comma = True
 force_grid_wrap = 0