updated ruff configuration to move all possible imports into TYPE_CHE…

…CKING

pyproject.toml

@@ -177,6 +177,17 @@ ignore = [
     "ANN102",  # missing cls annotation, we only annotate cls when we return it.
 ]
 
+extend-safe-fixes = [
+    "EM101",
+    "EM102",
+    "TCH001", "TCH002", "TCH003", "TCH004",
+    "C419",
+    "D200", "D205", "D415",
+    "PT003", "PT006", "PT018",
+    "RET504",
+    "UP006", "UP007",
+]
+
 [tool.ruff.lint.per-file-ignores]
 "tests/**" = [
     "D",  # we don't need public-API-polished docstrings in tests.
@@ -206,6 +217,10 @@ ignore-overlong-task-comments = true
 convention = "google"
 
 
+[tool.ruff.lint.flake8-type-checking]
+strict = true
+
+
 [build-system]
 requires = ["poetry-core>=1.2.0"]
 build-backend = "poetry.core.masonry.api"

screenpy/actions/either.py

@@ -7,13 +7,13 @@
 
 from typing import TYPE_CHECKING
 
-from typing_extensions import Self
-
 from screenpy.configuration import settings
 from screenpy.pacing import the_narrator
 from screenpy.speech_tools import get_additive_description
 
 if TYPE_CHECKING:
+    from typing_extensions import Self
+
     from screenpy import Actor
     from screenpy.protocols import Performable
 

screenpy/actions/log.py

@@ -4,13 +4,13 @@
 
 from typing import TYPE_CHECKING
 
-from typing_extensions import Self
-
 from screenpy.pacing import aside, beat
 from screenpy.protocols import Answerable
 from screenpy.speech_tools import get_additive_description, represent_prop
 
 if TYPE_CHECKING:
+    from typing_extensions import Self
+
     from screenpy.actor import Actor
 
     from .see import T_Q

screenpy/actions/make_note.py

@@ -4,8 +4,6 @@
 
 from typing import TYPE_CHECKING
 
-from typing_extensions import Self
-
 from screenpy.director import Director
 from screenpy.exceptions import UnableToAct
 from screenpy.pacing import aside, beat
@@ -15,6 +13,8 @@
 if TYPE_CHECKING:
     from typing import Union
 
+    from typing_extensions import Self
+
     from screenpy.actor import Actor
 
     T_Q = Union[Answerable, object]

screenpy/actions/pause.py

@@ -6,13 +6,13 @@
 from time import sleep
 from typing import TYPE_CHECKING
 
-from typing_extensions import Self
-
 from screenpy.exceptions import UnableToAct
 from screenpy.pacing import beat
 
 if TYPE_CHECKING:
 
+    from typing_extensions import Self
+
     from screenpy.actor import Actor
 
 

screenpy/actions/see.py

@@ -5,16 +5,18 @@
 from typing import TYPE_CHECKING
 
 from hamcrest import assert_that
-from typing_extensions import Self
 
 from screenpy.pacing import aside, beat
-from screenpy.protocols import Answerable, ErrorKeeper, Resolvable
+from screenpy.protocols import Answerable, ErrorKeeper
 from screenpy.speech_tools import get_additive_description, represent_prop
 
 if TYPE_CHECKING:
     from typing import Union
 
+    from typing_extensions import Self
+
     from screenpy.actor import Actor
+    from screenpy.protocols import Resolvable
 
     T_Q = Union[Answerable, object]
     T_R = Resolvable

screenpy/actions/see_all_of.py

@@ -4,14 +4,14 @@
 
 from typing import TYPE_CHECKING, Tuple
 
-from typing_extensions import Self
-
 from screenpy.exceptions import UnableToAct
 from screenpy.pacing import beat
 
 from .see import See
 
 if TYPE_CHECKING:
+    from typing_extensions import Self
+
     from screenpy.actor import Actor
 
     from .see import T_Q, T_R

screenpy/actions/see_any_of.py

@@ -4,8 +4,6 @@
 
 from typing import TYPE_CHECKING
 
-from typing_extensions import Self
-
 from screenpy.exceptions import UnableToAct
 from screenpy.pacing import beat
 
@@ -14,6 +12,8 @@
 if TYPE_CHECKING:
     from typing import Tuple
 
+    from typing_extensions import Self
+
     from screenpy.actor import Actor
 
     from .see import T_Q, T_R

screenpy/actor.py

@@ -8,15 +8,18 @@
 from __future__ import annotations
 
 from random import choice
-from typing import TypeVar
-
-from typing_extensions import Self
+from typing import TYPE_CHECKING, TypeVar
 
 from .exceptions import UnableToPerform
 from .pacing import aside
-from .protocols import Forgettable, Performable
+from .protocols import Forgettable
 from .speech_tools import get_additive_description
 
+if TYPE_CHECKING:
+    from typing_extensions import Self
+
+    from .protocols import Performable
+
 # pylint: disable=too-many-public-methods
 
 ENTRANCE_DIRECTIONS = [

screenpy/director.py

@@ -6,9 +6,10 @@
 
 from __future__ import annotations
 
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
-from typing_extensions import Self
+if TYPE_CHECKING:
+    from typing_extensions import Self
 
 
 class Director:

tests/test_pacing_future.py

@@ -5,11 +5,13 @@
 import logging
 from typing import TYPE_CHECKING
 
-from screenpy import Actor, IsEqualTo, See, beat
+from screenpy import IsEqualTo, See, beat
 
 if TYPE_CHECKING:
     import pytest
 
+    from screenpy import Actor
+
 
 class CornerCase:
     @beat("{} examines CornerCase")