Updated pre-commit modules and switched to ruff

Author: agronholm

.pre-commit-config.yaml

@@ -5,7 +5,7 @@
 # * Run "pre-commit install".
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.0
     hooks:
       - id: check-toml
       - id: check-yaml
@@ -15,38 +15,19 @@ repos:
         args: [ "--fix=lf" ]
       - id: trailing-whitespace
 
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.1
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.270
     hooks:
-      - id: pyupgrade
-        args: [ "--py37-plus", "--keep-runtime-typing" ]
+      - id: ruff
+        args: [--fix, --show-fixes]
 
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.3.0
     hooks:
       - id: black
 
-  - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
-    hooks:
-      - id: isort
-
-  - repo: https://github.com/csachs/pyproject-flake8
-    rev: v0.0.1a4
-    hooks:
-      - id: pyproject-flake8
-
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.950
+    rev: v1.3.0
     hooks:
       - id: mypy
-
-  - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.9.0
-    hooks:
-      - id: python-check-blanket-noqa
-      - id: python-check-blanket-type-ignore
-      - id: python-no-eval
-      - id: rst-backticks
-      - id: rst-directive-colons
-      - id: rst-inline-touching-normal
+        additional_dependencies: ["pytest"]

pyproject.toml

@@ -60,13 +60,18 @@ raygun = "asphalt.exceptions.reporters.raygun:RaygunExceptionReporter"
 version_scheme = "post-release"
 local_scheme = "dirty-tag"
 
-[tool.isort]
-src_paths = ["src"]
-skip_gitignore = true
-profile = "black"
+[tool.ruff]
+line-length = 99
+select = [
+    "E", "F", "W",  # default flake-8
+    "I",            # isort
+    "PGH",          # pygrep-hooks
+    "UP",           # pyupgrade
+]
+target-version = "py37"
 
-[tool.flake8]
-max-line-length = 99
+[tool.ruff.isort]
+known-first-party = ["asphalt.exceptions"]
 
 [tool.pytest.ini_options]
 addopts = "-rsx --tb=short"

src/asphalt/exceptions/__init__.py

@@ -17,7 +17,7 @@
 def report_exception(
     ctx: Context,
     message: str,
-    exception: BaseException = None,
+    exception: BaseException | None = None,
     *,
     logger: logging.Logger | str | bool = True,
 ) -> None:

src/asphalt/exceptions/component.py

@@ -3,7 +3,7 @@
 import logging
 from asyncio import AbstractEventLoop
 from functools import partial
-from typing import Any, AsyncIterator, Dict, Optional
+from typing import Any, AsyncIterator
 
 from asphalt.core import (
     Component,
@@ -62,7 +62,7 @@ class ExceptionReporterComponent(Component):
 
     def __init__(
         self,
-        reporters: Dict[str, Optional[Dict[str, Any]]] = None,
+        reporters: dict[str, dict[str, Any] | None] | None = None,
         install_default_handler: bool = True,
         **default_args,
     ) -> None:

src/asphalt/exceptions/reporters/sentry.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Dict, Sequence, Union
+from typing import Any, Sequence
 
 import sentry_sdk
 from asphalt.core import Context, resolve_reference
@@ -41,7 +41,7 @@ class SentryExceptionReporter(ExceptionReporter):
     """
 
     def __init__(
-        self, integrations: Sequence[Union[Integration, Dict[str, Any]]] = (), **options
+        self, integrations: Sequence[Integration | dict[str, Any]] = (), **options
     ) -> None:
         check_argument_types()
         options.setdefault("environment", "development" if __debug__ else "production")