auto-clean: fix typing errors and lint warnings

Author: elopez

crytic_compile/platform/embark.py

@@ -172,7 +172,7 @@ def clean(self, **_kwargs: str) -> None:
         """Clean compilation artifacts
 
         Args:
-            **kwargs: unused.
+            **_kwargs: unused.
         """
         return
 

crytic_compile/platform/foundry.py

@@ -16,6 +16,7 @@
 from crytic_compile.platform.types import Type
 from crytic_compile.utils.naming import convert_filename
 from crytic_compile.utils.natspec import Natspec
+from crytic_compile.utils.subprocess import run
 
 # Handle cycle
 if TYPE_CHECKING:
@@ -157,13 +158,21 @@ def compile(self, crytic_compile: "CryticCompile", **kwargs: str) -> None:
             compiler=compiler, version=version, optimized=optimized, optimize_runs=runs
         )
 
-    def clean(self, **_kwargs: str) -> None:
+    def clean(self, **kwargs: str) -> None:
         """Clean compilation artifacts
 
         Args:
-            **kwargs: unused.
+            **kwargs: optional arguments.
         """
-        return
+
+        ignore_compile = kwargs.get("foundry_ignore_compile", False) or kwargs.get(
+            "ignore_compile", False
+        )
+
+        if ignore_compile:
+            return
+
+        run(["forge", "clean"], cwd=self._target)
 
     @staticmethod
     def is_supported(target: str, **kwargs: str) -> bool:

crytic_compile/platform/hardhat.py

@@ -7,7 +7,7 @@
 import shutil
 import subprocess
 from pathlib import Path
-from typing import TYPE_CHECKING, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union
 
 from crytic_compile.compiler.compiler import CompilerVersion
 from crytic_compile.platform.exceptions import InvalidCompilation
@@ -36,17 +36,6 @@ class Hardhat(AbstractPlatform):
     PROJECT_URL = "https://github.com/nomiclabs/hardhat"
     TYPE = Type.HARDHAT
 
-    def _settings(self, args):
-        hardhat_ignore_compile = args.get("hardhat_ignore_compile", False) or args.get(
-            "ignore_compile", False
-        )
-
-        base_cmd = ["hardhat"]
-        if not args.get("npx_disable", False):
-            base_cmd = ["npx"] + base_cmd
-
-        return hardhat_ignore_compile, base_cmd
-
     # pylint: disable=too-many-locals,too-many-statements
     def compile(self, crytic_compile: "CryticCompile", **kwargs: str) -> None:
         """Run the compilation
@@ -242,6 +231,18 @@ def _guessed_tests(self) -> List[str]:
         """
         return ["hardhat test"]
 
+    @staticmethod
+    def _settings(args: Dict[str, Any]) -> Tuple[bool, List[str]]:
+        hardhat_ignore_compile = args.get("hardhat_ignore_compile", False) or args.get(
+            "ignore_compile", False
+        )
+
+        base_cmd = ["hardhat"]
+        if not args.get("npx_disable", False):
+            base_cmd = ["npx"] + base_cmd
+
+        return hardhat_ignore_compile, base_cmd
+
     def _get_hardhat_paths(
         self, base_cmd: List[str], args: Dict[str, str]
     ) -> Dict[str, Union[Path, str]]:

crytic_compile/platform/solc.py

@@ -186,7 +186,7 @@ def clean(self, **_kwargs: str) -> None:
         """Clean compilation artifacts
 
         Args:
-            **kwargs: unused.
+            **_kwargs: unused.
         """
         return
 

crytic_compile/platform/standard.py

@@ -97,7 +97,7 @@ def clean(self, **_kwargs: str) -> None:
         """Clean compilation artifacts
 
         Args:
-            **kwargs: unused.
+            **_kwargs: unused.
         """
         return
 

crytic_compile/platform/truffle.py

@@ -282,7 +282,7 @@ def clean(self, **_kwargs: str) -> None:
         """Clean compilation artifacts
 
         Args:
-            **kwargs: unused.
+            **_kwargs: unused.
         """
         return
 

crytic_compile/platform/vyper.py

@@ -91,7 +91,7 @@ def clean(self, **_kwargs: str) -> None:
         """Clean compilation artifacts
 
         Args:
-            **kwargs: unused.
+            **_kwargs: unused.
         """
         return
 

crytic_compile/platform/waffle.py

@@ -223,7 +223,7 @@ def clean(self, **_kwargs: str) -> None:
         """Clean compilation artifacts
 
         Args:
-            **kwargs: unused.
+            **_kwargs: unused.
         """
         return
 

crytic_compile/utils/subprocess.py

@@ -3,17 +3,17 @@
 from pathlib import Path
 import shutil
 import subprocess
-from typing import Dict, List
+from typing import Any, Dict, List, Optional, Union
 
 LOGGER = logging.getLogger("CryticCompile")
 
 
 def run(
     cmd: List[str],
-    cwd: os.PathLike | None = None,
-    extra_env: Dict[str, str] | None = None,
-    **kwargs,
-) -> subprocess.CompletedProcess | None:
+    cwd: Optional[Union[str, os.PathLike]] = None,
+    extra_env: Optional[Dict[str, str]] = None,
+    **kwargs: Any,
+) -> Optional[subprocess.CompletedProcess]:
     """
     Execute a command in a cross-platform compatible way.
 
@@ -28,7 +28,7 @@ def run(
         None: if there was a problem executing
     """
     subprocess_cwd = Path(os.getcwd() if cwd is None else cwd).resolve()
-    subprocess_env = None if extra_env is None else dict(os.environ, extra_env)
+    subprocess_env = None if extra_env is None else dict(os.environ, **extra_env)
     subprocess_exe = shutil.which(cmd[0])
 
     if subprocess_exe is None:
@@ -43,11 +43,11 @@ def run(
 
     try:
         return subprocess.run(
-            cmd, cwd=subprocess_cwd, executable=subprocess_exe, env=subprocess_env, **kwargs
+            cmd, executable=subprocess_exe, cwd=subprocess_cwd, env=subprocess_env, **kwargs
         )
     except FileNotFoundError:
         LOGGER.error("Could not execute `%s`, is it installed and in PATH?", cmd[0])
     except OSError:
-        LOGGER.error("OS error executing:", exc_info=1)
+        LOGGER.error("OS error executing:", exc_info=True)
 
     return None