Fix pyright issues

Author: ben-edna

create_venv.py

@@ -45,10 +45,9 @@ def pip_install(context: Any, *args: Any) -> None:
         intended for the global Python environment
         (same as EnvBuilder's _setup_pip)
         """
-        subprocess.call(  # nosec
+        subprocess.check_call(  # nosec
             (context.env_exe, "-Im", "pip", "install") + args,
             stderr=subprocess.STDOUT,
-            check=True,
         )
 
 

dfetch/commands/check.py

@@ -21,7 +21,7 @@
 
 import argparse
 import os
-from typing import Any, List  # pylint: disable=unused-import
+from typing import List
 
 import dfetch.commands.command
 import dfetch.manifest.manifest
@@ -46,7 +46,7 @@ class Check(dfetch.commands.command.Command):
     """
 
     @staticmethod
-    def create_menu(subparsers: "argparse._SubParsersAction[Any]") -> None:
+    def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None:
         """Add the parser menu for this action."""
         parser = dfetch.commands.command.Command.parser(subparsers, Check)
         parser.add_argument(

dfetch/commands/command.py

@@ -1,8 +1,21 @@
 """A generic command."""
 
 import argparse
+import sys
 from abc import ABC, abstractmethod
-from typing import Any, Type, TypeVar, cast  # pylint: disable=unused-import
+from argparse import ArgumentParser  # pylint: disable=unused-import
+from typing import TYPE_CHECKING, Type, TypeVar
+
+if TYPE_CHECKING and sys.version_info >= (3, 10):
+    from typing import TypeAlias
+
+    SubparserActionType: TypeAlias = (
+        "argparse._SubParsersAction[ArgumentParser]"  # pyright: ignore[reportPrivateUsage] #pylint: disable=protected-access
+    )
+else:
+    SubparserActionType = (
+        argparse._SubParsersAction  # pyright: ignore[reportPrivateUsage] #pylint: disable=protected-access
+    )
 
 
 class Command(ABC):
@@ -20,7 +33,7 @@ class Command(ABC):
 
     @staticmethod
     @abstractmethod
-    def create_menu(subparsers: "argparse._SubParsersAction[Any]") -> None:
+    def create_menu(subparsers: SubparserActionType) -> None:
         """Add a sub-parser to the given parser.
 
         Args:
@@ -42,7 +55,7 @@ def __call__(self, args: argparse.Namespace) -> None:
 
     @staticmethod
     def parser(
-        subparsers: "argparse._SubParsersAction[Any]",
+        subparsers: SubparserActionType,
         command: Type["Command.CHILD_TYPE"],
     ) -> "argparse.ArgumentParser":
         """Generate the parser.
@@ -72,4 +85,4 @@ def parser(
         )
 
         parser.set_defaults(func=command())
-        return cast(argparse.ArgumentParser, parser)
+        return parser

dfetch/commands/diff.py

@@ -52,7 +52,6 @@
 
 import argparse
 import os
-from typing import Any  # pylint: disable=unused-import
 from typing import List
 
 import dfetch.commands.command
@@ -79,7 +78,7 @@ class Diff(dfetch.commands.command.Command):
     """
 
     @staticmethod
-    def create_menu(subparsers: "argparse._SubParsersAction[Any]") -> None:
+    def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None:
         """Add the parser menu for this action."""
         parser = dfetch.commands.command.Command.parser(subparsers, Diff)
         parser.add_argument(

dfetch/commands/environment.py

@@ -2,7 +2,6 @@
 
 import argparse
 import platform
-from typing import Any  # pylint: disable=unused-import
 
 import dfetch.commands.command
 from dfetch.log import get_logger
@@ -18,7 +17,7 @@ class Environment(dfetch.commands.command.Command):
     """
 
     @staticmethod
-    def create_menu(subparsers: "argparse._SubParsersAction[Any]") -> None:
+    def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None:
         """Add the parser menu for this action."""
         dfetch.commands.command.Command.parser(subparsers, Environment)
 

dfetch/commands/freeze.py

@@ -41,7 +41,6 @@
 import argparse
 import os
 import shutil
-from typing import Any  # pylint: disable=unused-import
 from typing import List
 
 import dfetch.commands.command
@@ -63,7 +62,7 @@ class Freeze(dfetch.commands.command.Command):
     """
 
     @staticmethod
-    def create_menu(subparsers: "argparse._SubParsersAction[Any]") -> None:
+    def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None:
         """Add the parser menu for this action."""
         dfetch.commands.command.Command.parser(subparsers, Freeze)
 

dfetch/commands/import_.py

@@ -84,7 +84,6 @@
 import os
 import re
 from itertools import combinations
-from typing import Any  # pylint: disable=unused-import
 from typing import List, Sequence, Set, Tuple
 
 import dfetch.commands.command
@@ -107,7 +106,7 @@ class Import(dfetch.commands.command.Command):
     """
 
     @staticmethod
-    def create_menu(subparsers: "argparse._SubParsersAction[Any]") -> None:
+    def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None:
         """Add the parser menu for this action."""
         dfetch.commands.command.Command.parser(subparsers, Import)
 
@@ -265,7 +264,7 @@ def _determine_best_remotes(projects_urls: Set[str]) -> Tuple[str, ...]:
     potential_remotes = potential_remotes - useless_potential
 
     # For each permutation of any length, calculate the solution score
-    solutions = []
+    solutions: List[Tuple[int, Tuple[str, ...]]] = []
     for i in range(min(len(potential_remotes), max_remotes)):
         for solution in combinations(potential_remotes, i):
             score = _calculate_solution_score(solution, projects_urls)

dfetch/commands/init.py

@@ -6,7 +6,6 @@
 import argparse
 import os
 import shutil
-from typing import Any  # pylint: disable=unused-import
 
 import dfetch.commands.command
 from dfetch import DEFAULT_MANIFEST_NAME
@@ -23,7 +22,7 @@ class Init(dfetch.commands.command.Command):
     """
 
     @staticmethod
-    def create_menu(subparsers: "argparse._SubParsersAction[Any]") -> None:
+    def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None:
         """Add the parser menu for this action."""
         dfetch.commands.command.Command.parser(subparsers, Init)
 

dfetch/commands/report.py

@@ -6,7 +6,6 @@
 import argparse
 import glob
 import os
-from typing import Any  # pylint: disable=unused-import
 
 import infer_license
 
@@ -29,7 +28,7 @@ class Report(dfetch.commands.command.Command):
     """
 
     @staticmethod
-    def create_menu(subparsers: "argparse._SubParsersAction[Any]") -> None:
+    def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None:
         """Add the parser menu for this action."""
         parser = dfetch.commands.command.Command.parser(subparsers, Report)
 

dfetch/commands/update.py

@@ -22,7 +22,6 @@
 import argparse
 import os
 from pathlib import Path
-from typing import Any  # pylint: disable=unused-import
 from typing import List
 
 import dfetch.commands.command
@@ -45,7 +44,7 @@ class Update(dfetch.commands.command.Command):
     """
 
     @staticmethod
-    def create_menu(subparsers: "argparse._SubParsersAction[Any]") -> None:
+    def create_menu(subparsers: dfetch.commands.command.SubparserActionType) -> None:
         """Add the menu for the update action."""
         parser = dfetch.commands.command.Command.parser(subparsers, Update)
         parser.add_argument(