Switch to Ruff for linting and formatting

Author: marco-c

.flake8

@@ -1,25 +1,10 @@
 repos:
-  - repo: https://github.com/asottile/seed-isort-config
-    rev: v2.2.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.2.1
     hooks:
-      - id: seed-isort-config
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.10.1
-    hooks:
-      - id: isort
-  - repo: https://github.com/ambv/black
-    rev: 22.3.0
-    hooks:
-    - id: black
-  - repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - 'flake8-coding==1.3.1'
-          - 'flake8-copyright==0.2.2'
-          - 'flake8-debugger==3.1.0'
-          - 'flake8-mypy==17.8.0'
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.2.0
     hooks:

.isort.cfg

@@ -6,8 +6,7 @@
 import os
 import pickle
 from queue import Empty
-from typing import Any
-from typing import Callable
+from typing import Any, Callable
 
 import structlog
 
@@ -81,7 +80,6 @@ async def receive(self, name: str):
         logger.debug("Wait for message on bus", queue=name, instance=queue)
 
         if isinstance(queue, RedisQueue):
-
             # Clean the last processed message as we are awaiting a new one on this queue
             if name in self.redis_messages:
                 del self.redis_messages[name]

.pre-commit-config.yaml

@@ -20,8 +20,7 @@
 from libmozdata.phabricator import PhabricatorPatch
 
 from libmozevent.phabricator import PhabricatorBuild
-from libmozevent.utils import batch_checkout
-from libmozevent.utils import robust_checkout
+from libmozevent.utils import batch_checkout, robust_checkout
 
 logger = structlog.get_logger(__name__)
 

libmozevent/bus.py

@@ -1,14 +1,11 @@
 # -*- coding: utf-8 -*-
 import asyncio
-from datetime import datetime
-from datetime import timedelta
-from typing import Dict
-from typing import List
+from datetime import datetime, timedelta
+from typing import Dict, List
 
 import structlog
 from taskcluster.helper import TaskclusterConfig
-from taskcluster.utils import slugId
-from taskcluster.utils import stringDate
+from taskcluster.utils import slugId, stringDate
 
 logger = structlog.get_logger(__name__)
 
@@ -96,7 +93,6 @@ async def check_task(self):
         task_status = status["status"]["state"]
 
         if task_status in ("failed", "completed", "exception"):
-
             # Retry tasks in exception
             if task_status == "exception":
                 await self.retry_task(group_id, hook_id, task_id)

libmozevent/mercurial.py

@@ -7,9 +7,7 @@
 import fnmatch
 import itertools
 import json
-from typing import Dict
-from typing import List
-from typing import Tuple
+from typing import Dict, List, Tuple
 
 import aioamqp
 import structlog
@@ -147,7 +145,6 @@ def find_matching_queues(self, payload_exchange: str, payload_routes: List[bytes
         """
 
         def _match(exchange, route):
-
             # Exchanges must match exactly
             if payload_exchange != exchange:
                 return False

libmozevent/monitoring.py

@@ -15,13 +15,15 @@
 from redis import asyncio as aioredis
 from redis.asyncio.retry import Retry
 from redis.backoff import ExponentialBackoff
-from redis.exceptions import ConnectionError
-from redis.exceptions import ExecAbortError
-from redis.exceptions import PubSubError
-from redis.exceptions import RedisError
-from redis.exceptions import ResponseError
-from redis.exceptions import TimeoutError
-from redis.exceptions import WatchError
+from redis.exceptions import (
+    ConnectionError,
+    ExecAbortError,
+    PubSubError,
+    RedisError,
+    ResponseError,
+    TimeoutError,
+    WatchError,
+)
 
 log = structlog.get_logger(__name__)
 

libmozevent/pulse.py

@@ -9,8 +9,7 @@
 import os.path
 import urllib.parse
 from contextlib import contextmanager
-from datetime import datetime
-from datetime import timedelta
+from datetime import datetime, timedelta
 from unittest.mock import MagicMock
 
 import hglib
@@ -20,9 +19,11 @@
 from taskcluster.utils import stringDate
 
 from libmozevent.mercurial import Repository
-from libmozevent.phabricator import PhabricatorActions
-from libmozevent.phabricator import PhabricatorBuild
-from libmozevent.phabricator import PhabricatorBuildState
+from libmozevent.phabricator import (
+    PhabricatorActions,
+    PhabricatorBuild,
+    PhabricatorBuildState,
+)
 
 MOCK_DIR = os.path.join(os.path.dirname(__file__), "mocks")
 
@@ -193,7 +194,6 @@ def _user_search(request):
         return (200, json_headers, _response(mock_name))
 
     with responses.RequestsMock(assert_all_requests_are_fired=False) as resp:
-
         resp.add(
             responses.POST,
             "http://phabricator.test/api/user.whoami",

libmozevent/utils.py

@@ -7,11 +7,10 @@
 import hglib
 import pytest
 import responses
-
 from conftest import MockBuild
+
 from libmozevent.bus import MessageBus
-from libmozevent.mercurial import MercurialWorker
-from libmozevent.mercurial import Repository
+from libmozevent.mercurial import MercurialWorker, Repository
 
 MERCURIAL_FAILURE = """unable to find 'crash.txt' for patching
 (use '--prefix' to apply patch relative to the current directory)

tests/conftest.py

@@ -3,6 +3,7 @@
 from unittest.mock import Mock
 
 from conftest import MockBuild
+
 from libmozevent.phabricator import PhabricatorBuildState
 
 
@@ -14,7 +15,6 @@ def test_backoff(PhabricatorMock):
     build.state = PhabricatorBuildState.Queued
 
     with PhabricatorMock as phab:
-
         # Lower the max time to sleep to keep a speedy test
         phab.sleep = 0.1
 

tests/test_mercurial.py

@@ -8,9 +8,7 @@
 import pytest
 
 from libmozevent import utils
-from libmozevent.bus import AsyncRedis
-from libmozevent.bus import MessageBus
-from libmozevent.bus import RedisQueue
+from libmozevent.bus import AsyncRedis, MessageBus, RedisQueue
 
 
 def unexpected_error():