From fdc6ffd264d015d4f6ba22488a4e7ab78d365b24 Mon Sep 17 00:00:00 2001
From: Thaddeus Crews <repiteo@outlook.com>
Date: Fri, 20 Sep 2024 09:34:11 -0500
Subject: [PATCH] Style: Update `ruff` & `mypy` to latest versions

---
 .pre-commit-config.yaml                |  4 ++--
 modules/raycast/godot_update_embree.py | 14 +++++++-------
 pyproject.toml                         |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index cb25337fadf..8cfb00fd8ee 100644
--- a/.pre-commit-config.yaml
+++ b/.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$
diff --git a/modules/raycast/godot_update_embree.py b/modules/raycast/godot_update_embree.py
index c1790603650..c4fff330c93 100644
--- a/modules/raycast/godot_update_embree.py
+++ b/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)
 
diff --git a/pyproject.toml b/pyproject.toml
index 59b6d09a032..1cf789b4606 100644
--- a/pyproject.toml
+++ b/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"]