Fix black, mypy, and flake8 issue.

liaiss · liaiss · commit 179c95e189d3 · 2023-03-29T11:24:38.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -19,3 +19,8 @@ repos:
     - id: mypy
       files: '\.py$'
       exclude: '^tests/.+$'
+      additional_dependencies:
+        - types-python-dateutil
+        - types-PyYAML
+        - types-requests
+        - types-setuptools
diff --git a/src/e3/anod/context.py b/src/e3/anod/context.py
@@ -804,7 +804,6 @@ def decision_error(cls, action: Action, decision: Decision) -> NoReturn:
             Decision.LEFT,
             Decision.RIGHT,
         ):
-
             if decision.expected_choice == BuildOrDownload.BUILD:
                 msg = (
                     "A spec in the plan has a build_tree dependency"
diff --git a/src/e3/anod/deps.py b/src/e3/anod/deps.py
@@ -31,7 +31,6 @@ def __str__(self) -> str:
 
 
 class Dependency:
-
     kind: DEPENDENCY_PRIMITIVE
 
     def __init__(
diff --git a/src/e3/anod/error.py b/src/e3/anod/error.py
@@ -8,8 +8,6 @@
     from typing import Optional
     from e3.os.process import Run
 
-    assert Run  # Make pyflakes happy?
-
 
 class AnodError(e3.error.E3Error):
     """Base Anod error."""
diff --git a/src/e3/anod/package.py b/src/e3/anod/package.py
@@ -188,7 +188,6 @@ class SharedSource(Source):
 
 
 class SourceBuilder:
-
     DEFAULT_PATCH_CMD: Final = 1
 
     def __init__(
diff --git a/src/e3/anod/queries.py b/src/e3/anod/queries.py
@@ -141,7 +141,6 @@ def compute_closure(self, spec: Anod, publish: bool) -> None:
 
         # Follow dependencies
         for dep, dep_spec in list(self.context.dependencies[spec.uid].values()):
-
             # Only consider build and install dependency (discard source deps)
             if dep.kind in ("build", "install", "download"):
                 if dep_spec.kind == "install":
diff --git a/src/e3/anod/sandbox/__init__.py b/src/e3/anod/sandbox/__init__.py
@@ -147,7 +147,7 @@ def get_configuration(self) -> dict:
             return yaml.safe_load(f)
 
     def write_scripts(self) -> None:
-        from setuptools.command.easy_install import get_script_args
+        from setuptools.command.easy_install import get_script_args  # type: ignore[attr-defined]
 
         # Retrieve sandbox_scripts entry points
         e3_distrib = get_distribution("e3-core")
diff --git a/src/e3/anod/sandbox/action.py b/src/e3/anod/sandbox/action.py
@@ -24,7 +24,6 @@
 
 
 class SandBoxAction(metaclass=abc.ABCMeta):
-
     require_sandbox = True
 
     def __init__(self, subparsers):
@@ -61,7 +60,6 @@ def run(self, args):
 
 
 class SandBoxCreate(SandBoxAction):
-
     name = "create"
     help = "Create a new sandbox"
 
@@ -96,7 +94,6 @@ def run(self, args):
 
 
 class SandBoxShowConfiguration(SandBoxAction):
-
     name = "show-config"
     help = "Display sandbox configuration"
 
@@ -140,7 +137,6 @@ def error(message: str) -> NoReturn:
 
 
 class SandBoxExec(SandBoxCreate):
-
     name = "exec"
     help = "Execute anod action in an sandbox"
 
diff --git a/src/e3/anod/sandbox/migrate.py b/src/e3/anod/sandbox/migrate.py
@@ -9,7 +9,6 @@
 
 
 class SandBoxMigrate(SandBoxAction):
-
     name = "migrate"
     help = "Migrate to a newer anod API version"
     require_sandbox = False
diff --git a/src/e3/collection/dag.py b/src/e3/collection/dag.py
@@ -24,7 +24,6 @@ class DAGError(E3Error):
 
 
 class DAGIterator:
-
     NOT_VISITED = 0
     BUSY = 1
     VISITED = 2
diff --git a/src/e3/diff.py b/src/e3/diff.py
@@ -174,7 +174,6 @@ def process_regular_patch() -> int:
         with open(patch_file, newline="") as f, open(
             filtered_patch, "w", newline=""
         ) as fdout:
-
             # Two line headers that mark beginning of patches
             header1: tuple | tuple[str, str] = ()
             header2: tuple | tuple[str, str] = ()
diff --git a/src/e3/env.py b/src/e3/env.py
@@ -269,7 +269,6 @@ def get_platform(
             elif not propagate_build_info:
                 return Platform.get(*split_value)  # type: ignore
             else:
-
                 # Propagate machine name and OS version if necessary
                 if split_value[2] is None:
                     # No new machine name specified, reuse the current one
@@ -487,7 +486,7 @@ def to_dict(self) -> dict:
             can be used to format string. For example ``Env().target.os.name``
             will appear with the key ``target_os_name``, ...
         """
-        result = {k: v for k, v in self._items()}
+        result = dict(self._items())
         result["is_canadian"] = self.is_canadian
         result["is_cross"] = self.is_cross
         result["platform"] = self.platform
diff --git a/src/e3/mypy.py b/src/e3/mypy.py
@@ -3,7 +3,6 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-
     from typing import NoReturn
 
     def assert_never(value: NoReturn) -> NoReturn:
diff --git a/src/e3/net/http.py b/src/e3/net/http.py
@@ -78,7 +78,6 @@ def __str__(self) -> str:
 
 
 class HTTPSession:
-
     CHUNK_SIZE = 1024 * 1024
     DEFAULT_TIMEOUT = (60, 60)
 
diff --git a/src/e3/os/fs.py b/src/e3/os/fs.py
@@ -81,7 +81,7 @@ def chmod(mode: str, filename: str) -> int:
         actions = re.findall(r"(?:([-\+=])?([ugo]|[0-7]+|[rwx]*))", actionlist)
         assert "".join(list(itertools.chain.from_iterable(actions))) == actionlist
 
-        for (op, permlist) in actions:
+        for op, permlist in actions:
             if permlist == "" and op != "=":
                 continue
             else:
diff --git a/src/e3/store/cache/backends/filecache.py b/src/e3/store/cache/backends/filecache.py
@@ -21,7 +21,6 @@
 
 
 class FileCache(Cache):
-
     cache_suffix = ".cache"
 
     def __init__(self, cache_configuration: Any):
diff --git a/src/e3/sys.py b/src/e3/sys.py
@@ -66,21 +66,18 @@ def rewrite_node(self, node: ast.stmt) -> ast.stmt:
         check_in_names = None
 
         if isinstance(node, ast.ImportFrom):
-
             # node: ImportFrom(module, names)
             # first check whether the module match our rule
 
             if TYPE_CHECKING:
                 assert node.module is not None
             if re.match("^" + self.module + "$", node.module):
-
                 # then we need to check whether our 'name' is in the
                 # 'from' list (node.names)
 
                 check_in_names = self.name
 
         elif isinstance(node, ast.Import):
-
             # node: Import(names)
             # We need to check whether our 'module' appears in the imported
             # module names
@@ -341,7 +338,6 @@ def is_console() -> bool:
         return True
 
     if sys.platform == "win32":  # unix: no cover
-
         from msvcrt import get_osfhandle
         from e3.os.windows.object import object_name
 
diff --git a/src/e3/vcs/git.py b/src/e3/vcs/git.py
@@ -321,7 +321,6 @@ def to_commit(object_content: str) -> dict:
             result["message"] = body
 
             if max_diff_size > 0:
-
                 tempfile_name = None
                 try:
                     with closing(
diff --git a/tests/tests_e3/anod/context_test.py b/tests/tests_e3/anod/context_test.py
@@ -11,7 +11,6 @@
 
 
 class TestContext:
-
     spec_dir = os.path.join(os.path.dirname(__file__), "context_data")
 
     def create_context(self, reject_duplicates: bool = True) -> AnodContext:
@@ -647,7 +646,6 @@ def anod_action(
                 if uid.endswith("build"):
                     assert ac.tree.get_tag(uid)["plan_args"]["weathers"] == "B"
         else:
-
             with pytest.raises(SchedulingError):
                 for action in cm.execute(myplan, "myserver"):
                     ac.add_plan_action(action)
diff --git a/tests/tests_e3/anod/force_download_test.py b/tests/tests_e3/anod/force_download_test.py
@@ -6,7 +6,6 @@
 
 
 class TestSourceClosure:
-
     spec_dir = os.path.abspath(
         os.path.join(os.path.dirname(__file__), "force_download")
     )
diff --git a/tests/tests_e3/anod/loader_test.py b/tests/tests_e3/anod/loader_test.py
@@ -9,7 +9,6 @@
 
 
 class TestLoader:
-
     spec_dir = os.path.join(os.path.dirname(__file__), "data")
     spec2_dir = os.path.join(os.path.dirname(__file__), "data2")
 
diff --git a/tests/tests_e3/anod/spec_test.py b/tests/tests_e3/anod/spec_test.py
@@ -12,7 +12,6 @@
 
 def test_simple_spec():
     class Simple(Anod):
-
         test_qualifier_format = (("with_bar", False),)
 
         build_source_list = [
@@ -41,7 +40,6 @@ def test_spec_buildvars():
     """Build vars are used by the driver and not visible in deps."""
 
     class MySpec(Anod):
-
         build_deps = [Anod.BuildVar("key", "value")]
 
         @Anod.primitive()
@@ -72,7 +70,6 @@ def build(self):
     assert has_primitive(no_primitive, "build") is False
 
     class WithPrimitive(Anod):
-
         build_qualifier_format = (("error", False),)
 
         package = Anod.Package(prefix="mypackage", version=lambda: "42")
diff --git a/tests/tests_e3/anod/test_queries.py b/tests/tests_e3/anod/test_queries.py
@@ -5,7 +5,6 @@
 
 
 class TestSourceClosure:
-
     spec_dir = os.path.abspath(
         os.path.join(os.path.dirname(__file__), "source_closure_specs")
     )
diff --git a/tests/tests_e3/diff/main_test.py b/tests/tests_e3/diff/main_test.py
@@ -165,7 +165,6 @@ def test_patch_git_format_ignore():
 
 
 def test_patch_git_with_headers():
-
     test_dir = os.path.dirname(__file__)
     patch_file = os.path.join(test_dir, "git_patch_with_header")
 
diff --git a/tests/tests_e3/event/main_test.py b/tests/tests_e3/event/main_test.py
@@ -11,7 +11,6 @@
 
 
 def test_smtp_event():
-
     e3.event.add_handler(
         "smtp",
         subject="test subject",
diff --git a/tests/tests_e3/os/windows/fs/main_test.py b/tests/tests_e3/os/windows/fs/main_test.py
@@ -205,7 +205,6 @@ def fun(name, ntfile_instance):
     touch(test_file)
     ntfile = NTFile(test_file)
     try:
-
         with pytest.raises(NTException):
             status = ntfile.iterate_on_dir(fun, default_result=False)
     finally:
@@ -225,7 +224,6 @@ def test_is_dir_empty():
     ntfile2 = NTFile(deleted_file_path)
 
     try:
-
         assert ntfile.is_dir_empty
         touch(deleted_file_path)
         touch(deleted_file2_path)
diff --git a/tests/tests_e3/platform/main_test.py b/tests/tests_e3/platform/main_test.py
@@ -5,7 +5,6 @@
 
 
 def test_platform():
-
     a = e3.platform.Platform.get()
     b = e3.platform.Platform.get()
 
@@ -26,7 +25,6 @@ def test_is_host():
 
 
 def test_immutable():
-
     a = e3.platform.Platform.get()
 
     with pytest.raises(AttributeError):
