address ruff upgrade

Author: tybug

hypothesis-python/src/hypothesis/extra/ghostwriter.py

@@ -90,7 +90,6 @@
 from typing import (
     Any,
     Callable,
-    DefaultDict,
     ForwardRef,
     NamedTuple,
     Optional,
@@ -886,7 +885,7 @@ def _make_test_body(
 def _annotate_args(
     argnames: Iterable[str], funcs: Iterable[Callable], imports: ImportSet
 ) -> Iterable[str]:
-    arg_parameters: DefaultDict[str, set[Any]] = defaultdict(set)
+    arg_parameters: defaultdict[str, set[Any]] = defaultdict(set)
     for func in funcs:
         try:
             params = tuple(get_signature(func, eval_str=True).parameters.values())

hypothesis-python/src/hypothesis/internal/conjecture/datatree.py

@@ -9,9 +9,9 @@
 # obtain one at https://mozilla.org/MPL/2.0/.
 
 import math
-from collections.abc import Generator
+from collections.abc import Generator, Set
 from random import Random
-from typing import TYPE_CHECKING, AbstractSet, Final, Optional, Union, cast
+from typing import TYPE_CHECKING, Final, Optional, Union, cast
 
 import attr
 
@@ -431,7 +431,7 @@ class TreeNode:
     is_exhausted: bool = attr.ib(default=False, init=False)
 
     @property
-    def forced(self) -> AbstractSet[int]:
+    def forced(self) -> Set[int]:
         if not self.__forced:
             return EMPTY
         return self.__forced

hypothesis-python/src/hypothesis/internal/conjecture/engine.py

@@ -20,7 +20,7 @@
 from datetime import timedelta
 from enum import Enum
 from random import Random, getrandbits
-from typing import Callable, Final, List, Literal, NoReturn, Optional, Union, cast
+from typing import Callable, Final, Literal, NoReturn, Optional, Union, cast
 
 from hypothesis import HealthCheck, Phase, Verbosity, settings as Settings
 from hypothesis._settings import local_settings, note_deprecation
@@ -109,7 +109,7 @@ class HealthCheckState:
     valid_examples: int = field(default=0)
     invalid_examples: int = field(default=0)
     overrun_examples: int = field(default=0)
-    draw_times: "defaultdict[str, List[float]]" = field(
+    draw_times: defaultdict[str, list[float]] = field(
         default_factory=lambda: defaultdict(list)
     )
 

hypothesis-python/src/hypothesis/internal/conjecture/providers.py

@@ -651,7 +651,7 @@ def span_start(self, label: int, /) -> None:  # noqa: B027  # non-abstract noop
         internally.
         """
 
-    def span_end(self, discard: bool, /) -> None:  # noqa: B027, FBT001
+    def span_end(self, discard: bool, /) -> None:  # noqa: B027
         """Marks the end of a semantically meaningful span of choices.
 
         ``discard`` is ``True`` when the draw was filtered out or otherwise marked

hypothesis-python/src/hypothesis/strategies/_internal/types.py

@@ -949,25 +949,25 @@ def resolve_Iterator(thing):
     return st.iterables(st.from_type(thing.__args__[0]))
 
 
-@register(typing.Counter, st.builds(collections.Counter))
+@register(collections.Counter, st.builds(collections.Counter))
 def resolve_Counter(thing):
     return st.dictionaries(
         keys=st.from_type(thing.__args__[0]),
         values=st.integers(),
     ).map(collections.Counter)
 
 
-@register(typing.Deque, st.builds(collections.deque))
+@register(collections.deque, st.builds(collections.deque))
 def resolve_deque(thing):
     return st.lists(st.from_type(thing.__args__[0])).map(collections.deque)
 
 
-@register(typing.ChainMap, st.builds(dict).map(collections.ChainMap))
+@register(collections.ChainMap, st.builds(dict).map(collections.ChainMap))
 def resolve_ChainMap(thing):
     return resolve_Dict(thing).map(collections.ChainMap)
 
 
-@register(typing.OrderedDict, st.builds(dict).map(collections.OrderedDict))
+@register(collections.OrderedDict, st.builds(dict).map(collections.OrderedDict))
 def resolve_OrderedDict(thing):
     return resolve_Dict(thing).map(collections.OrderedDict)
 

hypothesis-python/src/hypothesis/vendor/pretty.py

@@ -83,8 +83,6 @@ def _repr_pretty_(self, p, cycle):
 
     from hypothesis.control import BuildContext
 
-# ruff: noqa: FBT001
-
 T = TypeVar("T")
 PrettyPrintFunction: "TypeAlias" = Callable[[Any, "RepresentationPrinter", bool], None]
 

hypothesis-python/tests/cover/test_lookup.py

@@ -54,6 +54,9 @@
 )
 from tests.common.utils import fails_with, temp_registered
 
+# we'll continue testing the typing variants until their removal from the stdlib
+# ruff: noqa: UP006, UP035
+
 sentinel = object()
 BUILTIN_TYPES = tuple(
     v

hypothesis-python/tests/cover/test_type_lookup.py

@@ -14,7 +14,7 @@
 import typing
 from collections.abc import Sequence
 from inspect import Parameter as P, Signature
-from typing import Callable, Generic, List as _List, TypeVar, Union
+from typing import Callable, Generic, TypeVar, Union
 
 import pytest
 
@@ -358,7 +358,7 @@ def test_generic_origin_with_type_args(generic, strategy):
         list,
         Sequence,
         # you can register types with all generic parameters
-        _List[T],
+        list[T],
         getattr(typing, "Sequence", None)[T],  # pyupgrade workaround
         pytest.param(list[T], marks=skip_39),
         pytest.param(Sequence[T], marks=skip_39),

hypothesis-python/tests/cover/test_validation.py

@@ -172,13 +172,13 @@ def test_recursion_validates_recursive_step():
 
 @fails_with(InvalidArgument)
 @given(x=integers())
-def test_stuff_keyword(x=1):
+def test_stuff_keyword(x=1):  # noqa: PT028
     pass
 
 
 @fails_with(InvalidArgument)
 @given(integers())
-def test_stuff_positional(x=1):
+def test_stuff_positional(x=1):  # noqa: PT028
     pass
 
 

hypothesis-python/tests/nocover/test_type_lookup_forward_ref.py

@@ -8,7 +8,7 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
-from typing import Dict as _Dict, ForwardRef, Union
+from typing import ForwardRef, Union
 
 import pytest
 
@@ -29,7 +29,7 @@
 @given(st.data())
 def test_mutually_recursive_types_with_typevar(data):
     # The previously-failing example from the issue
-    A = _Dict[bool, "B"]
+    A = dict[bool, "B"]
     B = Union[list[bool], A]
 
     with pytest.raises(ResolutionFailed, match=r"Could not resolve ForwardRef\('B'\)"):