winmake.py: print err in case of permission error

giampaolo · giampaolo · commit 5eead73d000c · 2025-04-09T13:55:41.000+02:00
diff --git a/Makefile b/Makefile
@@ -47,6 +47,7 @@ clean:  ## Remove all build files.
 		dist/ \
 		docs/_build/ \
 		htmlcov/ \
+		pytest-cache-files* \
 		wheelhouse
 
 .PHONY: build
diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py
@@ -15,7 +15,6 @@
 import argparse
 import atexit
 import ctypes
-import errno
 import fnmatch
 import os
 import shutil
@@ -124,16 +123,21 @@ def rm(pattern, directory=False):
 def safe_remove(path):
     try:
         os.remove(path)
-    except OSError as err:
-        if err.errno != errno.ENOENT:
-            raise
+    except FileNotFoundError:
+        pass
+    except PermissionError as err:
+        print(err)
     else:
         safe_print(f"rm {path}")
 
 
 def safe_rmtree(path):
+    def onerror(func, path, err):
+        if not issubclass(err[0], FileNotFoundError):
+            print(err[1])
+
     existed = os.path.isdir(path)
-    shutil.rmtree(path, ignore_errors=True)
+    shutil.rmtree(path, onerror=onerror)
     if existed and not os.path.isdir(path):
         safe_print(f"rmdir -f {path}")
 
@@ -282,6 +286,7 @@ def clean():
         "*__pycache__",
         ".coverage",
         ".failed-tests.txt",
+        "pytest-cache-files*",
     )
     safe_rmtree("build")
     safe_rmtree(".coverage")
@@ -318,11 +323,7 @@ def test(args=None):
 def test_by_name(arg):
     """Run specific test by name."""
     build()
-    sh([
-        PYTHON,
-        "-m",
-        "pytest",
-    ])
+    sh([PYTHON, "-m", "pytest", arg])
 
 
 def test_by_regex(arg):
diff --git a/setup.py b/setup.py
@@ -114,7 +114,6 @@
     "vulture",
     "wheel",
     "pyreadline ; os_name == 'nt'",
-    "pdbpp ; os_name == 'nt'",
 ]
 
 macros = []

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@`
`114`	`114`	`"vulture",`
`115`	`115`	`"wheel",`
`116`	`116`	`"pyreadline ; os_name == 'nt'",`
`117`		`- "pdbpp ; os_name == 'nt'",`
`118`	`117`	`]`
`119`	`118`
`120`	`119`	`macros = []`