Eliminated pyupgrade and black in favor of ruff/ruff-format

Author: agronholm

.pre-commit-config.yaml

@@ -15,21 +15,10 @@ repos:
     args: ["--fix=lf"]
   - id: trailing-whitespace
 
-- repo: https://github.com/asottile/pyupgrade
-  rev: v3.15.0
-  hooks:
-  - id: pyupgrade
-    args: ["--py37-plus", "--keep-runtime-typing"]
-
 - repo: https://github.com/astral-sh/ruff-pre-commit
   rev: v0.1.6
   hooks:
     - id: ruff
       args: [--fix, --show-fixes]
       exclude: "tests/test_catch_py311.py"
-
-- repo: https://github.com/psf/black
-  rev: 23.11.0
-  hooks:
-  - id: black
-    exclude: "tests/test_catch_py311.py"
+    - id: ruff-format

pyproject.toml

@@ -45,15 +45,17 @@ local_scheme = "dirty-tag"
 write_to = "src/exceptiongroup/_version.py"
 
 [tool.ruff]
-line-length = 88
 select = [
     "E", "F", "W",  # default flake-8
     "I",            # isort
     "ISC",          # flake8-implicit-str-concat
     "PGH",          # pygrep-hooks
     "RUF100",       # unused noqa (yesqa)
 ]
-target-version = "py37"
+
+[tool.ruff.pyupgrade]
+# Preserve types, even if a file imports `from __future__ import annotations`.
+keep-runtime-typing = true
 
 [tool.ruff.isort]
 known-first-party = ["exceptiongroup"]

src/exceptiongroup/_exceptions.py

@@ -27,7 +27,7 @@ def check_direct_subclass(
 def get_condition_filter(
     condition: type[_BaseExceptionT]
     | tuple[type[_BaseExceptionT], ...]
-    | Callable[[_BaseExceptionT_co], bool]
+    | Callable[[_BaseExceptionT_co], bool],
 ) -> Callable[[_BaseExceptionT_co], bool]:
     if isclass(condition) and issubclass(
         cast(Type[BaseException], condition), BaseException