pyproject.toml: Enforce import annotations style

Add new ruff rules and fix their fallout:
future-annotations = true
   select = [
    "TC",  # type-checking import placement rules
    "FA",  # future annotations rules
   ]
This comprises:
- Streamline imports and exports in cmds.xxx.Cmd
    - Import base class as "Base"
    - Export types Cmd and Parent via __all__
- Move all types imported only for annotation below TYPE_CHECKING
- Use "from __future__ import annotations" all over the place
Signed-off-by: Jan Lindemann <jan@janware.com>

conf/topdir/pyproject.toml

@@ -38,10 +38,14 @@
 
 [tool.ruff.lint]
 
+  future-annotations = true
+
   select = [
     "F",    # Pyflakes, includes F401
     "E",    # pycodestyle errors
     "W",    # pycodestyle warnings
+    "TC",  # type-checking import placement rules
+    "FA",  # future annotations rules
   ]
 
   ignore = [

src/python/jw/pkg/App.py

@@ -4,7 +4,6 @@
 
 from __future__ import annotations
 
-import argparse
 import os
 import pwd
 import re
@@ -19,10 +18,7 @@ from .lib.Distro import Distro
 from .lib.log import DEBUG, ERR, log
 
 if TYPE_CHECKING:
-    import os
+    import argparse
-    import pwd
-    import re
-    import sys
 
     from typing import TypeAlias
 

src/python/jw/pkg/cmds/Cmd.py

@@ -2,15 +2,15 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from ..CmdBase import CmdBase
+from ..App import App as Parent
+from ..CmdBase import CmdBase as Base
 
 if TYPE_CHECKING:
-    from ..App import App
     from ..lib.Distro import Distro
 
-class Cmd(CmdBase):  # export
+class Cmd(Base):  # export
 
-    def __init__(self, parent: App | CmdBase, name: str, help: str) -> None:
+    def __init__(self, parent: Parent, name: str, help: str) -> None:
         super().__init__(parent, name, help)
 
     async def _run(self, args):
@@ -20,3 +20,5 @@ class Cmd(CmdBase):  # export
     @property
     def distro(self) -> Distro:
         return self.app.distro
+
+__all__ = ['Parent', 'Cmd']

src/python/jw/pkg/cmds/CmdPkg.py

@@ -1,11 +1,15 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
     from argparse import ArgumentParser
 
-from ..App import App
+class CmdPkg(Cmd):  # export
-from .Cmd import Cmd as CmdBase
 
-class CmdPkg(CmdBase):  # export
+    def __init__(self, parent: Parent) -> None:
-
-    def __init__(self, parent: App) -> None:
         super().__init__(parent, 'pkg', help = 'System package manager wrapper')
         self.load_subcommands()
 

src/python/jw/pkg/cmds/CmdPlatform.py

@@ -1,11 +1,15 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
     from argparse import ArgumentParser
 
-from ..App import App
+class CmdPlatform(Cmd):  # export
-from .Cmd import Cmd as CmdBase
 
-class CmdPlatform(CmdBase):  # export
+    def __init__(self, parent: Parent) -> None:
-
-    def __init__(self, parent: App) -> None:
         super().__init__(
             parent, 'platform', help = 'Miscellaneous platform-related comamnds'
         )

src/python/jw/pkg/cmds/CmdPosix.py

@@ -1,11 +1,15 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
     from argparse import ArgumentParser
 
-from ..App import App
+class CmdPosix(Cmd):  # export
-from .Cmd import Cmd as CmdBase
 
-class CmdPosix(CmdBase):  # export
+    def __init__(self, parent: Parent) -> None:
-
-    def __init__(self, parent: App) -> None:
         super().__init__(
             parent,
             'posix',

src/python/jw/pkg/cmds/CmdProjects.py

@@ -1,13 +1,17 @@
+from __future__ import annotations
+
 import sys
 
+from typing import TYPE_CHECKING
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
     from argparse import ArgumentParser
 
-from ..App import App
+class CmdProjects(Cmd):  # export
-from .Cmd import Cmd as CmdBase
 
-class CmdProjects(CmdBase):  # export
+    def __init__(self, parent: Parent) -> None:
-
-    def __init__(self, parent: App) -> None:
         super().__init__(
             parent,
             'projects',

src/python/jw/pkg/cmds/CmdSecrets.py

@@ -1,11 +1,15 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
     from argparse import ArgumentParser
 
-from ..App import App
+class CmdSecrets(Cmd):  # export
-from .Cmd import Cmd as CmdBase
 
-class CmdSecrets(CmdBase):  # export
+    def __init__(self, parent: Parent) -> None:
-
-    def __init__(self, parent: App) -> None:
         super().__init__(parent, 'secrets', help = 'Manage package secrets')
         self.load_subcommands()
 

src/python/jw/pkg/cmds/pkg/Cmd.py

@@ -2,12 +2,19 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-if TYPE_CHECKING:
+from ...CmdBase import CmdBase as Base
-    from ..CmdPkg import CmdPkg
+from ..CmdPkg import CmdPkg as Parent
 
-from ..Cmd import Cmd as Base
+if TYPE_CHECKING:
+    from ...lib.Distro import Distro
 
 class Cmd(Base):  # export
 
-    def __init__(self, parent: CmdPkg, name: str, help: str) -> None:
+    def __init__(self, parent: Parent, name: str, help: str) -> None:
         super().__init__(parent, name, help)
+
+    @property
+    def distro(self) -> Distro:
+        return self.app.distro
+
+__all__ = ['Parent', 'Cmd']

src/python/jw/pkg/cmds/pkg/CmdDelete.py

@@ -1,11 +1,15 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
-from ..CmdPkg import CmdPkg
+from typing import TYPE_CHECKING
-from .Cmd import Cmd
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdDelete(Cmd):  # export
 
-    def __init__(self, parent: CmdPkg) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(parent, 'delete', help = 'Delete packages by name')
 
     def add_arguments(self, parser: ArgumentParser) -> None:

src/python/jw/pkg/cmds/pkg/CmdDup.py

@@ -1,11 +1,15 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
-from ..CmdPkg import CmdPkg
+from typing import TYPE_CHECKING
-from .Cmd import Cmd
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdDup(Cmd):  # export
 
-    def __init__(self, parent: CmdPkg) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(parent, 'dup', help = 'Upgrade distribution')
 
     def add_arguments(self, parser: ArgumentParser) -> None:

src/python/jw/pkg/cmds/pkg/CmdInstall.py

@@ -1,11 +1,15 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
-from ..CmdPkg import CmdPkg
+from typing import TYPE_CHECKING
-from .Cmd import Cmd
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdInstall(Cmd):  # export
 
-    def __init__(self, parent: CmdPkg) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(
             parent,
             'install',

src/python/jw/pkg/cmds/pkg/CmdLs.py

@@ -1,11 +1,15 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
     from argparse import ArgumentParser, Namespace
 
-from ..CmdPkg import CmdPkg
+class CmdLs(Cmd):  # export
-from .NamedPkgsCmd import NamedPkgsCmd as Base
 
-class CmdLs(Base):  # export
+    def __init__(self, parent: Parent) -> None:
-
-    def __init__(self, parent: CmdPkg) -> None:
         super().__init__(parent, 'ls', help = 'List package contents')
 
     def add_arguments(self, parser: ArgumentParser) -> None:

src/python/jw/pkg/cmds/pkg/CmdMeta.py

@@ -1,11 +1,15 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from .NamedPkgsCmd import NamedPkgsCmd, Parent
+
+if TYPE_CHECKING:
     from argparse import ArgumentParser, Namespace
 
-from ..CmdPkg import CmdPkg
+class CmdMeta(NamedPkgsCmd):  # export
-from .NamedPkgsCmd import NamedPkgsCmd as Base
 
-class CmdMeta(Base):  # export
+    def __init__(self, parent: Parent) -> None:
-
-    def __init__(self, parent: CmdPkg) -> None:
         super().__init__(parent, 'meta', help = 'List package metadata')
 
     def add_arguments(self, parser: ArgumentParser) -> None:

src/python/jw/pkg/cmds/pkg/CmdRebootRequired.py

@@ -1,11 +1,15 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
-from ..CmdPkg import CmdPkg
+from typing import TYPE_CHECKING
-from .Cmd import Cmd
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdRebootRequired(Cmd):  # export
 
-    def __init__(self, parent: CmdPkg) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(
             parent,
             'reboot-required',

src/python/jw/pkg/cmds/pkg/CmdRefresh.py

@@ -1,11 +1,15 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
-from ..CmdPkg import CmdPkg
+from typing import TYPE_CHECKING
-from .Cmd import Cmd
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdRefresh(Cmd):  # export
 
-    def __init__(self, parent: CmdPkg) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(
             parent,
             'refresh',

src/python/jw/pkg/cmds/pkg/CmdSelect.py

@@ -1,12 +1,16 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from ...lib.PackageFilter import PackageFilterString
-from ..CmdPkg import CmdPkg
+from .Cmd import Cmd, Parent
-from .Cmd import Cmd
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdSelect(Cmd):  # export
 
-    def __init__(self, parent: CmdPkg) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(parent, 'select', help = 'Select packages by filter')
 
     def add_arguments(self, parser: ArgumentParser) -> None:

src/python/jw/pkg/cmds/pkg/NamedPkgsCmd.py

@@ -1,9 +1,13 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
     from argparse import ArgumentParser
 
-from ..CmdPkg import CmdPkg as Parent
+class NamedPkgsCmd(Cmd):  # export
-from .Cmd import Cmd as Base
-
-class NamedPkgsCmd(Base):  # export
 
     def __init__(self, parent: Parent, name: str, help: str) -> None:
         super().__init__(parent, name, help)
@@ -11,3 +15,5 @@ class NamedPkgsCmd(Base):  # export
     def add_arguments(self, parser: ArgumentParser) -> None:
         super().add_arguments(parser)
         parser.add_argument('names', nargs = '*', help = 'Package names')
+
+__all__ = ['NamedPkgsCmd', 'Parent']

src/python/jw/pkg/cmds/platform/Cmd.py

@@ -1,13 +1,11 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from ...CmdBase import CmdBase as Base
-
+from ..CmdPlatform import CmdPlatform as Parent
-if TYPE_CHECKING:
-    from ..CmdPlatform import CmdPlatform
-
-from ..Cmd import Cmd as Base
 
 class Cmd(Base):  # export
 
-    def __init__(self, parent: CmdPlatform, name: str, help: str) -> None:
+    def __init__(self, parent: Parent, name: str, help: str) -> None:
         super().__init__(parent, name, help)
+
+__all__ = ['Parent', 'Cmd']

src/python/jw/pkg/cmds/platform/CmdInfo.py

@@ -1,12 +1,16 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from ...lib.Distro import Distro
-from ..Cmd import Cmd
+from .Cmd import Cmd, Parent
-from ..CmdPlatform import CmdPlatform
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdInfo(Cmd):  # export
 
-    def __init__(self, parent: CmdPlatform) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(
             parent, 'info', help = 'Retrieve information about target platform'
         )

src/python/jw/pkg/cmds/posix/Cmd.py

@@ -1,17 +1,19 @@
 from __future__ import annotations
 
-from argparse import ArgumentParser
 from typing import TYPE_CHECKING
 
-from ...CmdBase import CmdBase
+from ...CmdBase import CmdBase as Base
-
-if TYPE_CHECKING:
 from ..CmdPosix import CmdPosix as Parent
 
-class Cmd(CmdBase):  # export
+if TYPE_CHECKING:
+    from argparse import ArgumentParser
+
+class Cmd(Base):  # export
 
     def __init__(self, parent: Parent, name: str, help: str) -> None:
         super().__init__(parent, name, help)
 
     def add_arguments(self, parser: ArgumentParser) -> None:
         super().add_arguments(parser)
+
+__all__ = ['Parent', 'Cmd']

src/python/jw/pkg/cmds/posix/CmdCopy.py

@@ -3,16 +3,14 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from ...lib.util import copy
-from .Cmd import Cmd
+from .Cmd import Cmd, Parent
 
 if TYPE_CHECKING:
     from argparse import ArgumentParser, Namespace
 
-    from ..CmdPosix import CmdPosix
-
 class CmdCopy(Cmd):  # export
 
-    def __init__(self, parent: CmdPosix) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(parent, 'copy', help = 'Copy files')
 
     def add_arguments(self, parser: ArgumentParser) -> None:

src/python/jw/pkg/cmds/posix/CmdTar.py

@@ -1,9 +1,13 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from .Cmd import Cmd, Parent
+
+if TYPE_CHECKING:
     from argparse import ArgumentParser, Namespace
 
-from ..CmdPosix import CmdPosix as Parent
+class CmdTar(Cmd):  # export
-from .Cmd import Cmd as Base
-
-class CmdTar(Base):  # export
 
     def __init__(self, parent: Parent) -> None:
         super().__init__(parent, 'tar', help = 'Handle tar archives')

src/python/jw/pkg/cmds/posix/tar/Cmd.py

@@ -1,14 +1,19 @@
-from argparse import ArgumentParser
+from __future__ import annotations
-from collections.abc import AsyncIterator
-from contextlib import asynccontextmanager
 
-from ....CmdBase import CmdBase
+from contextlib import asynccontextmanager
+from typing import TYPE_CHECKING
+
+from ....CmdBase import CmdBase as Base
 from ....lib.FileContext import FileContext
 from ....lib.ProcFilterGpg import ProcFilterGpg
 from ....lib.TarIo import TarIo
 from ..CmdTar import CmdTar as Parent
 
-class Cmd(CmdBase):  # export
+if TYPE_CHECKING:
+    from argparse import ArgumentParser
+    from collections.abc import AsyncIterator
+
+class Cmd(Base):  # export
 
     def __init__(self, parent: Parent, name: str, help: str) -> None:
         super().__init__(parent, name, help)
@@ -27,3 +32,5 @@ class Cmd(CmdBase):  # export
         parser.add_argument(
             '-f', '--archive-path', required = True, help = 'Archive path'
         )
+
+__all__ = ['Parent', 'Cmd']

src/python/jw/pkg/cmds/posix/tar/CmdExtract.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
-from argparse import ArgumentParser, Namespace
-
 from ....lib.log import DEBUG, log
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdExtract(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/BaseCmdPkgRelations.py

@@ -1,9 +1,14 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from .Cmd import Cmd, Parent
 from .lib.pkg_relations import VersionSyntax
 from .lib.pkg_relations import pkg_relations as pkg_relations_list
 
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
+
 class BaseCmdPkgRelations(Cmd):
 
     def pkg_relations(self, rel_type: str, args: Namespace) -> str:
@@ -130,3 +135,5 @@ class BaseCmdPkgRelations(Cmd):
 
     async def _run(self, args: Namespace) -> None:
         return self.print_pkg_relations(self.relation, args)
+
+__all__ = ['Parent', 'BaseCmdPkgRelations']

src/python/jw/pkg/cmds/projects/Cmd.py

@@ -1,14 +1,19 @@
 from __future__ import annotations
 
-from argparse import ArgumentParser
+from typing import TYPE_CHECKING
 
-from ...CmdBase import CmdBase
+from ...CmdBase import CmdBase as Base
 from ..CmdProjects import CmdProjects as Parent
 
-class Cmd(CmdBase):  # export
+if TYPE_CHECKING:
+    from argparse import ArgumentParser
+
+class Cmd(Base):  # export
 
     def __init__(self, parent: Parent, name: str, help: str) -> None:
         super().__init__(parent, name, help)
 
     def add_arguments(self, parser: ArgumentParser) -> None:
         super().add_arguments(parser)
+
+__all__ = ['Parent', 'Cmd']

src/python/jw/pkg/cmds/projects/CmdBuild.py

@@ -1,14 +1,18 @@
+from __future__ import annotations
 import datetime
 import os
 import re
 
-from argparse import ArgumentParser, Namespace
 from functools import lru_cache
 
 from ...App import Scope
 from ...lib.log import DEBUG, ERR, NOTICE, log
 from ...lib.util import get_profile_env, pretty_cmd
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdBuild(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdCanonicalizeRemotes.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
-from argparse import ArgumentParser, Namespace
 from typing import TYPE_CHECKING
 
 from ...lib.base import InputMode
 from ...lib.log import NOTICE, log
 from .Cmd import Cmd, Parent
+from ...lib.base import Result
 
 if TYPE_CHECKING:
-    from ...lib.base import Result
+    from argparse import ArgumentParser, Namespace
 
 class CmdCanonicalizeRemotes(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdCflags.py

@@ -1,7 +1,11 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from ...App import Scope
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdCflags(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdCheck.py

@@ -1,8 +1,11 @@
+from __future__ import annotations
 import sys
 
-from argparse import ArgumentParser
-
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser
 
 class CmdCheck(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdCommands.py

@@ -1,6 +1,10 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdCommands(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdCreatePkgConfig.py

@@ -1,7 +1,11 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from .Cmd import Cmd, Parent
 from .lib.templates import tmpl_render
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdCreatePkgConfig(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdExepath.py

@@ -1,7 +1,11 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from ...App import Scope
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdExepath(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdGetAuthInfo.py

@@ -1,11 +1,14 @@
+from __future__ import annotations
 import os
 import re
 
-from argparse import ArgumentParser, Namespace
-
 from ...lib.log import DEBUG, log
 from ...lib.Uri import Uri
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdGetAuthInfo(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdGetval.py

@@ -1,6 +1,10 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdGetval(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdHtdocsDir.py

@@ -1,6 +1,10 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdHtdocsDir(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdLdflags.py

@@ -1,7 +1,11 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from ...App import Scope
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdLdflags(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdLdlibpath.py

@@ -1,7 +1,11 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from ...App import Scope
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdLdlibpath(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdLibname.py

@@ -1,6 +1,10 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdLibname(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdListRepos.py

@@ -1,12 +1,15 @@
+from __future__ import annotations
 import os
 import re
 
-from argparse import ArgumentParser, Namespace
-
 from ...lib.log import DEBUG, log
 from ...lib.Uri import Uri
 from ...lib.util import get_password, get_username, run_curl_into
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdListRepos(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdModules.py

@@ -1,9 +1,12 @@
+from __future__ import annotations
 import re
 
-from argparse import ArgumentParser, Namespace
-
 from ...lib.log import DEBUG, log
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdModules(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdPath.py

@@ -1,7 +1,11 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from ...App import Scope
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdPath(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdPkgConflicts.py

@@ -1,5 +1,4 @@
-from .BaseCmdPkgRelations import BaseCmdPkgRelations as Base
+from .BaseCmdPkgRelations import BaseCmdPkgRelations as Base, Parent
-from .Cmd import Parent
 
 class CmdPkgConflicts(Base):  # export
 

src/python/jw/pkg/cmds/projects/CmdPkgProvides.py

@@ -1,5 +1,4 @@
-from .BaseCmdPkgRelations import BaseCmdPkgRelations as Base
+from .BaseCmdPkgRelations import BaseCmdPkgRelations as Base, Parent
-from .Cmd import Parent
 
 class CmdPkgProvides(Base):  # export
 

src/python/jw/pkg/cmds/projects/CmdPkgRequires.py

@@ -1,5 +1,4 @@
-from .BaseCmdPkgRelations import BaseCmdPkgRelations as Base
+from .BaseCmdPkgRelations import BaseCmdPkgRelations as Base, Parent
-from .Cmd import Parent
 
 class CmdPkgRequires(Base):  # export
 

src/python/jw/pkg/cmds/projects/CmdProjDir.py

@@ -1,7 +1,11 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from ...lib.log import WARNING, log
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdProjDir(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdPythonpath.py

@@ -1,7 +1,11 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from ...App import Scope
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdPythonpath(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdPythonpathOrig.py

@@ -1,9 +1,12 @@
+from __future__ import annotations
 import os
 
-from argparse import ArgumentParser, Namespace
-
 from ...App import Scope
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdPythonpathOrig(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdRequiredOsPkg.py

@@ -1,8 +1,12 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from ...App import Scope
 from ...lib.log import DEBUG, log
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 # TODO: seems at least partly redundant to CmdPkgRequires / print_pkg_relations
 class CmdRequiredOsPkg(Cmd):  # export

src/python/jw/pkg/cmds/projects/CmdSummary.py

@@ -1,6 +1,10 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdSummary(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdTest.py

@@ -1,6 +1,10 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdTest(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/CmdTmplDir.py

@@ -1,6 +1,10 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdTmplDir(Cmd):  # export
 

src/python/jw/pkg/cmds/projects/check/Cmd.py

@@ -1,14 +1,19 @@
 from __future__ import annotations
 
-from argparse import ArgumentParser
+from typing import TYPE_CHECKING
 
-from ....CmdBase import CmdBase
+from ....CmdBase import CmdBase as Base
 from ..CmdCheck import CmdCheck as Parent
 
-class Cmd(CmdBase):  # export
+if TYPE_CHECKING:
+    from argparse import ArgumentParser
+
+class Cmd(Base):  # export
 
     def __init__(self, parent: Parent, name: str, help: str) -> None:
         super().__init__(parent, name, help)
 
     def add_arguments(self, parser: ArgumentParser) -> None:
         super().add_arguments(parser)
+
+__all__ = ['Parent', 'Cmd']

src/python/jw/pkg/cmds/projects/check/CmdDep.py

@@ -1,7 +1,11 @@
-from argparse import ArgumentParser, Namespace
+from __future__ import annotations
 
 from ....lib.log import NOTICE, log
 from .Cmd import Cmd, Parent
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from argparse import ArgumentParser, Namespace
 
 class CmdDep(Cmd):  # export
 

src/python/jw/pkg/cmds/secrets/Cmd.py

@@ -1,19 +1,19 @@
 from __future__ import annotations
 
-from argparse import ArgumentParser
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-from ...CmdBase import CmdBase
+from ...CmdBase import CmdBase as Base
 from ..CmdSecrets import CmdSecrets as Parent
-
-if TYPE_CHECKING:
-    from typing import Iterable
-    from .lib.base import Attrs
-
 from .lib.DistroContext import DistroContext
 
-class Cmd(CmdBase):  # export
+if TYPE_CHECKING:
+    from argparse import ArgumentParser
+    from typing import Iterable
+
+    from .lib.base import Attrs
+
+class Cmd(Base):  # export
 
     @cached_property
     def ctx(self) -> DistroContext:
@@ -49,3 +49,5 @@ class Cmd(CmdBase):  # export
     def add_arguments(self, parser: ArgumentParser) -> None:
         super().add_arguments(parser)
         parser.add_argument('packages', nargs = '*', help = 'Package names')
+
+__all__ = ['Parent', 'Cmd']

src/python/jw/pkg/cmds/secrets/CmdCompileTemplates.py

@@ -2,17 +2,15 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from .Cmd import Cmd
+from .Cmd import Cmd, Parent
 from .lib.base import Attrs
 
 if TYPE_CHECKING:
     from argparse import ArgumentParser, Namespace
 
-    from ..CmdSecrets import CmdSecrets
-
 class CmdCompileTemplates(Cmd):  # export
 
-    def __init__(self, parent: CmdSecrets) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(
             parent, 'compile-templates', help = 'Compile package template files'
         )

src/python/jw/pkg/cmds/secrets/CmdInstall.py

@@ -2,16 +2,14 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from .Cmd import Cmd
+from .Cmd import Cmd, Parent
 
 if TYPE_CHECKING:
     from argparse import ArgumentParser, Namespace
 
-    from ..CmdSecrets import CmdSecrets
-
 class CmdInstall(Cmd):  # export
 
-    def __init__(self, parent: CmdSecrets) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(
             parent,
             'install',

src/python/jw/pkg/cmds/secrets/CmdListCompilationOutput.py

@@ -2,16 +2,14 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from .Cmd import Cmd
+from .Cmd import Cmd, Parent
 
 if TYPE_CHECKING:
     from argparse import ArgumentParser, Namespace
 
-    from ..CmdSecrets import CmdSecrets
-
 class CmdListCompilationOutput(Cmd):  # export
 
-    def __init__(self, parent: CmdSecrets) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(
             parent,
             'list-compilation-output',

src/python/jw/pkg/cmds/secrets/CmdListSecrets.py

@@ -2,16 +2,14 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from .Cmd import Cmd
+from .Cmd import Cmd, Parent
 
 if TYPE_CHECKING:
     from argparse import ArgumentParser, Namespace
 
-    from ..CmdSecrets import CmdSecrets
-
 class CmdListSecrets(Cmd):  # export
 
-    def __init__(self, parent: CmdSecrets) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(parent, 'list-secrets', help = 'List package secret files')
 
     def add_arguments(self, parser: ArgumentParser) -> None:

src/python/jw/pkg/cmds/secrets/CmdListTemplates.py

@@ -2,16 +2,14 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from .Cmd import Cmd
+from .Cmd import Cmd, Parent
 
 if TYPE_CHECKING:
     from argparse import Namespace
 
-    from ..CmdSecrets import CmdSecrets
-
 class CmdListTemplates(Cmd):  # export
 
-    def __init__(self, parent: CmdSecrets) -> None:
+    def __init__(self, parent: Parent) -> None:
         super().__init__(parent, 'list-templates', help = 'List package template files')
 
     async def _run(self, args: Namespace) -> None:

src/python/jw/pkg/cmds/secrets/lib/DistroContext.py

@@ -8,10 +8,10 @@ from typing import TYPE_CHECKING
 
 from ....lib.log import DEBUG, NOTICE, WARNING, log
 from ....lib.ProcFilterGpg import ProcFilterGpg
-from .base import Attrs
 from .FilesContext import FilesContext
 
 if TYPE_CHECKING:
+    from .base import Attrs
     from typing import Iterable
 
     from ....lib.Distro import Distro

src/python/jw/pkg/cmds/secrets/lib/tar.py

@@ -7,11 +7,11 @@ from tarfile import TarFile
 from typing import TYPE_CHECKING, Callable
 
 from ....lib.log import DEBUG, log
+from ....lib.ExecContext import ExecContext
 
 if TYPE_CHECKING:
     from typing import Iterable
 
-    from ....lib.ExecContext import ExecContext
     from ....lib.FileContext import FileContext
 
 def filter(

src/python/jw/pkg/cmds/secrets/lib/util.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from ....lib.ec.Local import Local
-from ....lib.FileContext import FileContext
 from .FilesContext import FilesContext
 
 if TYPE_CHECKING:
+    from ....lib.FileContext import FileContext
     from .base import Attrs
 
 async def compile_template_file(

src/python/jw/pkg/lib/AsyncRunner.py

@@ -4,8 +4,10 @@ import asyncio
 import concurrent.futures
 import contextlib
 
+from typing import TypeVar, TYPE_CHECKING
+
+if TYPE_CHECKING:
     from collections.abc import Awaitable, Generator
-from typing import TypeVar
 
 T = TypeVar('T')
 

src/python/jw/pkg/lib/Cmd.py

@@ -3,13 +3,13 @@ from __future__ import annotations
 import abc
 import sys
 
-from argparse import ArgumentParser
 from typing import TYPE_CHECKING
 
 from .log import ERR
 from .Types import LoadTypes, Types
 
 if TYPE_CHECKING:
+    from argparse import ArgumentParser
     from typing import Any
 
     from .App import App

src/python/jw/pkg/lib/Distro.py

@@ -9,11 +9,12 @@ from functools import cached_property
 from typing import TYPE_CHECKING
 
 from .log import ERR, INFO, WARNING, log
+from .base import InputMode
 
 if TYPE_CHECKING:
     from typing import Iterable
 
-    from .base import InputMode, Result
+    from .base import Result
     from .ExecContext import ExecContext
     from .Package import Package
     from .PackageFilter import PackageFilter

src/python/jw/pkg/lib/FileContext.py

@@ -8,10 +8,11 @@ from typing import TYPE_CHECKING
 
 from .log import DEBUG, ERR, log
 from .Uri import Uri
+from .ProcFilter import ProcPipeline
 
 if TYPE_CHECKING:
     from .base import Result, StatResult
-    from .ProcFilter import ProcFilter, ProcPipeline
+    from .ProcFilter import ProcFilter
 
 class FileContext(abc.ABC):
 

src/python/jw/pkg/lib/PackageFilter.py

@@ -1,6 +1,10 @@
+from __future__ import annotations
 import abc
 import re
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
     from .Package import Package
 
 class PackageFilter(abc.ABC):

src/python/jw/pkg/lib/ProcFilterGpg.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from .base import Result
 from .ProcFilter import ProcFilter
 
 if TYPE_CHECKING:
+    from .base import Result
     from .ExecContext import ExecContext
 
 class ProcFilterGpg(ProcFilter):

src/python/jw/pkg/lib/TarIo.py

@@ -6,10 +6,13 @@ import tarfile
 
 from tarfile import TarFile, TarInfo
 
-from .base import StatResult
 from .CopyContext import CopyContext
 from .ExecContext import ExecContext
 from .log import DEBUG, ERR, log
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .base import StatResult
 
 class TarIo(CopyContext):
 

src/python/jw/pkg/lib/Types.py

@@ -1,14 +1,15 @@
+from __future__ import annotations
 import abc
 import os
 import re
 import sys
 
-from collections.abc import Iterator
 from typing import TYPE_CHECKING, Generic, Iterable, TypeVar
 
 from .log import OFF, log, parse_log_level
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
     from typing import Any
 
 T = TypeVar('T')

src/python/jw/pkg/lib/base.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
-import os
-
 from enum import Enum, auto
-from typing import NamedTuple, TypeAlias
+from typing import NamedTuple, TypeAlias, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    import os
 
 class InputMode(Enum):
     Interactive = auto()

src/python/jw/pkg/lib/ec/Curl.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from ..base import Result
 from ..FileContext import FileContext as Base
 
 if TYPE_CHECKING:
+    from ..base import Result
     from ..ExecContext import ExecContext
     from ..Uri import Uri
     from .Local import Local

src/python/jw/pkg/lib/ec/SSHClient.py

@@ -8,13 +8,12 @@ import sys
 from enum import Flag, auto
 from typing import TYPE_CHECKING
 
-from ..base import Result
 from ..ExecContext import ExecContext
 from ..log import DEBUG, ERR, INFO, NOTICE, WARNING, log
 from ..Uri import Uri
 
 if TYPE_CHECKING:
-    from ..Uri import Uri
+    from ..base import Result
 
 class SSHClient(ExecContext):
 

src/python/jw/pkg/lib/ec/ssh/Paramiko.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import paramiko  # type: ignore[import-untyped] # error: Library stubs not installed for "paramiko"
+import paramiko.agent  # type: ignore[import-untyped]
+import paramiko.SCPClient  # type: ignore[import-untyped]
 
 from ...base import Result
 from ...log import ERR, log
@@ -12,9 +14,6 @@ from .util import join_cmd
 if TYPE_CHECKING:
     from typing import Any
 
-    import paramiko.agent  # type: ignore[import-untyped]
-    import paramiko.SCPClient  # type: ignore[import-untyped]
-
 class Paramiko(Base):
 
     def __init__(self, uri, *args, **kwargs) -> None:

src/python/jw/pkg/lib/util.py

@@ -4,7 +4,6 @@ import json
 import os
 import sys
 
-from argparse import Namespace
 from enum import Enum, auto
 from typing import TYPE_CHECKING, Iterable, TypeVar, cast
 
@@ -13,6 +12,7 @@ from .log import DEBUG, ERR, log
 from .Uri import Uri
 
 if TYPE_CHECKING:
+    from argparse import Namespace
     from .ExecContext import ExecContext
     from .FileContext import FileContext
     from .ProcFilter import ProcFilter, ProcPipeline
@@ -93,7 +93,7 @@ async def run_curl_into(
         raise TypeError(
             f'Expected {expected_type.__name__}, got {type(ret).__name__} from Curl'
         )
-    return cast(T, ret)
+    return cast('T', ret)
 
 async def run_askpass(
     askpass_env: list[str],