Switched from black to ruff-format and added extra rules

Author: agronholm

.pre-commit-config.yaml

@@ -20,11 +20,7 @@ repos:
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]
-
-  - repo: https://github.com/psf/black
-    rev: 23.12.1
-    hooks:
-      - id: black
+      - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.8.0

pyproject.toml

@@ -29,6 +29,7 @@ classifiers = [
 requires-python = ">=3.7"
 dependencies = [
     "asphalt ~= 4.6",
+    "typing_extensions >= 4.6.0; python_version < '3.10'"
 ]
 dynamic = ["version"]
 
@@ -65,13 +66,19 @@ local_scheme = "dirty-tag"
 
 [tool.ruff]
 line-length = 99
+target-version = "py37"
+
+[tool.ruff.lint]
 select = [
-    "E", "F", "W",  # default flake-8
+    "ASYNC",        # flake8-async
+    "E", "F", "W",  # default Flake8
+    "G",            # flake8-logging-format
     "I",            # isort
+    "ISC",          # flake8-implicit-str-concat
     "PGH",          # pygrep-hooks
+    "RUF100",       # unused noqa (yesqa)
     "UP",           # pyupgrade
 ]
-target-version = "py37"
 
 [tool.ruff.isort]
 known-first-party = ["asphalt.exceptions"]

src/asphalt/exceptions/api.py

@@ -48,9 +48,7 @@ class ExtrasProvider(metaclass=ABCMeta):
     """
 
     @abstractmethod
-    def get_extras(
-        self, ctx: Context, reporter: ExceptionReporter
-    ) -> dict[str, Any] | None:
+    def get_extras(self, ctx: Context, reporter: ExceptionReporter) -> dict[str, Any] | None:
         """
         Return context specific extras for the given exception reporter backend.
 

tests/test_component.py

@@ -17,9 +17,7 @@ def report_exception(
         self.reported_exception = exception
 
 
-@pytest.mark.parametrize(
-    "install_default_handler", [True, False], ids=["default", "nodefault"]
-)
+@pytest.mark.parametrize("install_default_handler", [True, False], ids=["default", "nodefault"])
 @pytest.mark.asyncio
 async def test_start(caplog, install_default_handler):
     class DummyReporter(ExceptionReporter):

tests/test_report_exception.py

@@ -12,16 +12,10 @@
     [True, False, "asphalt.exceptions", logging.getLogger("asphalt.exceptions")],
     ids=["autologger", "nologger", "strlogger", "loggerinstance"],
 )
-@pytest.mark.parametrize(
-    "faulty_extras_provider", [False, True], ids=["goodextras", "badextras"]
-)
-@pytest.mark.parametrize(
-    "faulty_reporter", [False, True], ids=["goodreporter", "badreporter"]
-)
+@pytest.mark.parametrize("faulty_extras_provider", [False, True], ids=["goodextras", "badextras"])
+@pytest.mark.parametrize("faulty_reporter", [False, True], ids=["goodreporter", "badreporter"])
 @pytest.mark.asyncio
-async def test_report_exception(
-    logger, faulty_extras_provider, faulty_reporter, caplog
-):
+async def test_report_exception(logger, faulty_extras_provider, faulty_reporter, caplog):
     reported_exception = reported_message = None
 
     class DummyReporter(ExceptionReporter):
@@ -59,9 +53,7 @@ def get_extras(self, ctx: Context, reporter: ExceptionReporter):
 
     if faulty_reporter and logger:
         messages = [
-            record.message
-            for record in caplog.records
-            if record.name == "asphalt.exceptions"
+            record.message for record in caplog.records if record.name == "asphalt.exceptions"
         ]
         assert messages[-1].startswith(
             "error calling exception reporter "
@@ -71,6 +63,4 @@ def get_extras(self, ctx: Context, reporter: ExceptionReporter):
 
 def test_no_exception():
     exc = pytest.raises(Exception, report_exception, Context(), "test")
-    exc.match(
-        'missing "exception" parameter and no current exception present in sys.exc_info()'
-    )
+    exc.match('missing "exception" parameter and no current exception present in sys.exc_info()')