fix: ignore errors in rmtree (3.8+ should be fine on Windows now)

wntrblm · Nov 5, 2024 · 275fe8f · 275fe8f
1 parent 122835a
commit 275fe8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/nox/__main__.py b/nox/__main__.py
@@ -120,7 +120,7 @@ def run_script_mode(envdir: Path, reuse: bool, dependencies: list[str]) -> NoRet
     if sys.platform.startswith("win"):
         raise SystemExit(
             subprocess.run(
-                ["nox", sys.argv[1:]],
+                ["nox", *sys.argv[1:]],
                 env=venv.env,
                 stdout=None,
                 stderr=None,

diff --git a/nox/virtualenv.py b/nox/virtualenv.py
@@ -306,7 +306,7 @@ def _clean_location(self) -> bool:
             if self.reuse_existing and is_conda:
                 return False
             if not is_conda:
-                shutil.rmtree(self.location)
+                shutil.rmtree(self.location, ignore_errors=True)
             else:
                 cmd = [
                     self.conda_cmd,
@@ -318,8 +318,7 @@ def _clean_location(self) -> bool:
                 ]
                 nox.command.run(cmd, silent=True, log=False)
             # Make sure that location is clean
-            with contextlib.suppress(FileNotFoundError):
-                shutil.rmtree(self.location)
+            shutil.rmtree(self.location, ignore_errors=True)
 
         return True
 
@@ -446,7 +445,7 @@ def _clean_location(self) -> bool:
                 and self._check_reused_environment_interpreter()
             ):
                 return False
-            shutil.rmtree(self.location)
+            shutil.rmtree(self.location, ignore_errors=True)
         return True
 
     def _read_pyvenv_cfg(self) -> dict[str, str] | None: