Browse Source

Style: Update `ruff` & `mypy` to latest versions

Thaddeus Crews 10 months ago
parent
commit
fdc6ffd264
3 changed files with 10 additions and 9 deletions
  1. 2 2
      .pre-commit-config.yaml
  2. 7 7
      modules/raycast/godot_update_embree.py
  3. 1 0
      pyproject.toml

+ 2 - 2
.pre-commit-config.yaml

@@ -39,14 +39,14 @@ repos:
         stages: [manual] # Not automatically triggered, invoked via `pre-commit run --hook-stage manual clang-tidy`
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.4
+    rev: v0.6.6
     hooks:
       - id: ruff
         args: [--fix]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.971
+    rev: v1.11.2
     hooks:
       - id: mypy
         files: \.py$

+ 7 - 7
modules/raycast/godot_update_embree.py

@@ -4,8 +4,8 @@ import re
 import shutil
 import stat
 import subprocess
-from types import TracebackType
-from typing import Any, Callable, Tuple, Type
+import sys
+from typing import Any, Callable
 
 git_tag = "v4.3.1"
 
@@ -100,9 +100,7 @@ subprocess.run(["git", "checkout", git_tag])
 commit_hash = str(subprocess.check_output(["git", "rev-parse", "HEAD"], universal_newlines=True)).strip()
 
 
-def on_rm_error(
-    function: Callable[..., Any], path: str, excinfo: Tuple[Type[Exception], Exception, TracebackType]
-) -> None:
+def on_rm_error(function: Callable[..., Any], path: str, excinfo: Exception) -> None:
     """
     Error handler for `shutil.rmtree()`.
 
@@ -113,10 +111,12 @@ def on_rm_error(
     os.unlink(path)
 
 
-# 3.12 Python and beyond should replace `onerror` with `onexc`.
 # We remove the .git directory because it contains
 # a lot of read-only files that are problematic on Windows.
-shutil.rmtree(".git", onerror=on_rm_error)
+if sys.version_info >= (3, 12):
+    shutil.rmtree(".git", onexc=on_rm_error)
+else:
+    shutil.rmtree(".git", onerror=on_rm_error)  # type: ignore
 
 all_files = set(cpp_files)
 

+ 1 - 0
pyproject.toml

@@ -10,6 +10,7 @@ warn_unreachable = true
 namespace_packages = true
 explicit_package_bases = true
 exclude = ["thirdparty/"]
+python_version = "3.8"
 
 [tool.ruff]
 extend-exclude = ["thirdparty"]