treewide: various cleanups to move imports for mypy into typechecking blocks

Along the way, add __future__ annotations where lacking.

3 files changed, 6 insertions, 4 deletions

diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
index 8c552f5..cb432a3 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from __future__ import annotations
 
 import re
 import dataclasses
@@ -20,14 +21,13 @@ from pathlib import Path
 
 from .. import mlog
 from .. import mesonlib
-from ..environment import Environment
 
 from .base import DependencyException, SystemDependency
 from .pkgconfig import PkgConfigDependency
 from .misc import threads_factory
 
 if T.TYPE_CHECKING:
-    from ..environment import Properties
+    from ..environment import Environment, Properties
 
 # On windows 3 directory layouts are supported:
 # * The default layout (versioned) installed:
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py
index 1ae7071..5c4edd4 100644
--- a/mesonbuild/dependencies/cmake.py
+++ b/mesonbuild/dependencies/cmake.py
@@ -11,10 +11,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from __future__ import annotations
 
 from .base import ExternalDependency, DependencyException, DependencyTypeName
 from ..mesonlib import is_windows, MesonException, PerMachine, stringlistify, extract_as_list
-from ..cmake import CMakeExecutor, CMakeTraceParser, CMakeException, CMakeToolchain, CMakeExecScope, check_cmake_args, CMakeTarget, resolve_cmake_trace_targets, cmake_is_debug
+from ..cmake import CMakeExecutor, CMakeTraceParser, CMakeException, CMakeToolchain, CMakeExecScope, check_cmake_args, resolve_cmake_trace_targets, cmake_is_debug
 from .. import mlog
 import importlib.resources
 from pathlib import Path
@@ -26,6 +27,7 @@ import textwrap
 import typing as T
 
 if T.TYPE_CHECKING:
+    from ..cmake import CMakeTarget
     from ..environment import Environment
     from ..envconfig import MachineInfo
 
diff --git a/mesonbuild/dependencies/factory.py b/mesonbuild/dependencies/factory.py
index 48cd5ab..8474b51 100644
--- a/mesonbuild/dependencies/factory.py
+++ b/mesonbuild/dependencies/factory.py
@@ -18,7 +18,6 @@ import functools
 import typing as T
 
 from .base import DependencyException, DependencyMethods
-from .base import ExternalDependency
 from .base import process_method_kw
 from .base import BuiltinDependency, SystemDependency
 from .cmake import CMakeDependency
@@ -26,6 +25,7 @@ from .framework import ExtraFrameworkDependency
 from .pkgconfig import PkgConfigDependency
 
 if T.TYPE_CHECKING:
+    from .base import ExternalDependency
     from .configtool import ConfigToolDependency
     from ..environment import Environment
     from ..mesonlib import MachineChoice