Merge pull request #14612 from pytest-dev/patchback/backports/9.1.x/974ed48b696d706b7e7cc834ddca9bb0edd488a4/pr-14611

[PR #14611/974ed48b backport][9.1.x] mark/structures: undo non-collection-argvalues type-check time deprecation due to mypy bug

Author: bluetech

changelog/14606.bugfix.rst

@@ -0,0 +1 @@
+Fixed ``list-item`` typing errors from mypy in :ref:`@pytest.mark.parametrize <pytest.mark.parametrize ref>` ``argvalues`` parameter.

src/_pytest/mark/structures.py

@@ -21,7 +21,6 @@
 import warnings
 
 from .._code import getfslineno
-from ..compat import deprecated
 from ..compat import NOTSET
 from ..compat import NotSetType
 from _pytest.config import Config
@@ -537,31 +536,16 @@ def __call__(
         ) -> MarkDecorator: ...
 
     class _ParametrizeMarkDecorator(MarkDecorator):
-        @overload  # type: ignore[override,no-overload-impl]
-        def __call__(
-            self,
-            argnames: str | Sequence[str],
-            argvalues: Collection[ParameterSet | Sequence[object] | object],
-            *,
-            indirect: bool | Sequence[str] = ...,
-            ids: Iterable[None | str | float | int | bool | _HiddenParam]
-            | Callable[[Any], object | None]
-            | None = ...,
-            scope: ScopeName | None = ...,
-        ) -> MarkDecorator: ...
-
-        @overload
-        @deprecated(
-            "Passing a non-Collection iterable to the 'argvalues' parameter of @pytest.mark.parametrize is deprecated. "
-            "Convert argvalues to a list or tuple.",
-        )
-        def __call__(
+        def __call__(  # type: ignore[override]
             self,
             argnames: str | Sequence[str],
             argvalues: Iterable[ParameterSet | Sequence[object] | object],
+            # TODO(pytest10): Change to below after PARAMETRIZE_NON_COLLECTION_ITERABLE deprecation.
+            #                 Overload doesn't work, see #14606.
+            # argvalues: Collection[ParameterSet | Sequence[object] | object],
             *,
             indirect: bool | Sequence[str] = ...,
-            ids: Iterable[None | str | float | int | bool]
+            ids: Iterable[None | str | float | int | bool | _HiddenParam]
             | Callable[[Any], object | None]
             | None = ...,
             scope: ScopeName | None = ...,

testing/typing_checks.py

@@ -67,15 +67,14 @@ def test_hidden_param(x: int) -> None:
     pass
 
 
-# Test @pytest.mark.parametrize iterator argvalues deprecation.
-# Will be complain about unused type ignore if doesn't work.
-@pytest.mark.parametrize("x", iter(range(10)))  # type: ignore[deprecated]
-def test_it(x: int) -> None:
-    pass
-
-
 # Issue #14137.
 def check_scope_typing() -> None:
 
     custom_scope: ScopeName = "function"
     assert_type(custom_scope, ScopeName)
+
+
+# Issue #14606.
+@pytest.mark.parametrize("x", [ImportError, AttributeError])
+def check_mypy_bug_with_argvalues(x) -> None:
+    pass