squash: update

Author: happz

tmt/steps/__init__.py

@@ -17,6 +17,7 @@
     TYPE_CHECKING,
     Any,
     Callable,
+    ClassVar,
     Generic,
     Literal,
     Optional,
@@ -1565,7 +1566,7 @@ def get_data_class(cls) -> type[StepDataT]:
     #:    When the plugin base class is defined, the step class does not
     #:    even exist yet. Therefore this link is set after both classes,
     #:    step and its plugin base, are finalized.
-    _step_class: type[Step]
+    _step_class: ClassVar[type[Step]]
 
     @classmethod
     def get_step_name(cls) -> str:

tmt/steps/cleanup/__init__.py

@@ -1,7 +1,6 @@
 import copy
 from typing import Optional, TypeVar, cast
 
-import fmf
 import fmf.utils
 
 import tmt.log

tmt/steps/discover/__init__.py

@@ -23,7 +23,7 @@
 import tmt.utils.filesystem
 import tmt.utils.git
 import tmt.utils.url
-from tmt.options import option
+from tmt.options import option as option
 from tmt.plugins import PluginRegistry
 from tmt.steps import Action
 from tmt.utils import Command, Environment, EnvVarValue, GeneralError, Path

tmt/steps/execute/__init__.py

@@ -8,7 +8,6 @@
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any, Optional, TypeVar, Union, cast
 
-import click
 import fmf.utils
 
 import tmt
@@ -21,7 +20,7 @@
 from tmt.checks import Check, CheckEvent, CheckPlugin
 from tmt.container import container, field, simple_field
 from tmt.guest import Guest
-from tmt.options import option
+from tmt.options import option as option
 from tmt.plugins import PluginRegistry
 from tmt.result import (
     CheckResult,
@@ -51,7 +50,6 @@
 )
 
 if TYPE_CHECKING:
-    import tmt.cli
     import tmt.result
     import tmt.steps.discover
 

tmt/steps/finish/__init__.py

@@ -1,14 +1,13 @@
 import copy
-from typing import TYPE_CHECKING, Any, Optional, TypeVar, cast
+from typing import Optional, TypeVar, cast
 
-import click
 import fmf
 
 import tmt
 import tmt.steps
 from tmt.container import container
 from tmt.guest import Guest
-from tmt.options import option
+from tmt.options import option as option
 from tmt.plugins import PluginRegistry
 from tmt.result import PhaseResult, ResultGuestData, ResultOutcome
 from tmt.steps import (
@@ -21,9 +20,6 @@
     sync_with_guests,
 )
 
-if TYPE_CHECKING:
-    import tmt.cli
-
 
 @container
 class FinishStepData(tmt.steps.WhereableStepData, tmt.steps.StepData):

tmt/steps/prepare/__init__.py

@@ -1,7 +1,6 @@
 import copy
-from typing import TYPE_CHECKING, Any, Literal, Optional, TypeVar, cast
+from typing import TYPE_CHECKING, Literal, Optional, TypeVar, cast
 
-import click
 import fmf.utils
 
 import tmt
@@ -10,7 +9,7 @@
 import tmt.utils
 from tmt.container import container, simple_field
 from tmt.guest import Guest
-from tmt.options import option
+from tmt.options import option as option
 from tmt.plugins import PluginRegistry
 from tmt.result import PhaseResult, ResultGuestData, ResultOutcome
 from tmt.steps import (
@@ -26,7 +25,6 @@
 
 if TYPE_CHECKING:
     import tmt.base.core
-    import tmt.cli
     from tmt.base.core import Plan
 
 

tmt/steps/provision/__init__.py

@@ -9,7 +9,6 @@
     cast,
 )
 
-import click
 import fmf.utils
 from click import echo
 
@@ -29,16 +28,17 @@
 )
 from tmt.log import Logger
 from tmt.package_managers import (
-    FileSystemPath,
-    Package,
+    FileSystemPath as FileSystemPath,
+)
+from tmt.package_managers import (
+    Package as Package,
 )
 from tmt.plugins import PluginRegistry
 from tmt.steps import Action, ActionTask, PhaseQueue, PushTask, sync_with_guests
 from tmt.utils import Path
 
 if TYPE_CHECKING:
     import tmt.base.core
-    import tmt.cli
 
 
 @container

tmt/steps/report/__init__.py

@@ -1,16 +1,11 @@
-from typing import TYPE_CHECKING, Any, Optional, TypeVar, Union, cast
-
-import click
+from typing import Optional, TypeVar, Union, cast
 
 import tmt.steps
 from tmt.container import container
-from tmt.options import option
+from tmt.options import option as option
 from tmt.plugins import PluginRegistry
 from tmt.steps import Action
 
-if TYPE_CHECKING:
-    import tmt.cli
-
 
 @container
 class ReportStepData(tmt.steps.StepData):