Switch isort/flake8 to ruff

Author: ndevenish

.pre-commit-config.yaml

@@ -11,22 +11,11 @@ repos:
     args: ['--maxkb=200']
   - id: check-yaml
 
-# Automatically sort imports
-- repo: https://github.com/PyCQA/isort
-  rev: 5.12.0
+- repo: https://github.com/charliermarsh/ruff-pre-commit
+  rev: v0.0.272
   hooks:
-  - id: isort
-    args: [
-           '-a', 'from __future__ import annotations',        # 3.7-3.11
-           '--rm', 'from __future__ import absolute_import',  # -3.0
-           '--rm', 'from __future__ import division',         # -3.0
-           '--rm', 'from __future__ import generator_stop',   # -3.7
-           '--rm', 'from __future__ import generators',       # -2.3
-           '--rm', 'from __future__ import nested_scopes',    # -2.2
-           '--rm', 'from __future__ import print_function',   # -3.0
-           '--rm', 'from __future__ import unicode_literals', # -3.0
-           '--rm', 'from __future__ import with_statement',   # -2.6
-          ]
+    - id: ruff
+      args: [--fix, --show-fixes, --exit-non-zero-on-fix]
 
 # Automatic source code formatting
 - repo: https://github.com/psf/black
@@ -35,13 +24,6 @@ repos:
   - id: black
     args: [--safe, --quiet]
 
-# Linting
-- repo: https://github.com/PyCQA/flake8
-  rev: 6.1.0
-  hooks:
-  - id: flake8
-    additional_dependencies: ['flake8-comprehensions==3.14.0', 'flake8-pyproject>=1.2.3']
-
 # Type checking
 - repo: https://github.com/pre-commit/mirrors-mypy
   rev: v0.910

pyproject.toml

@@ -83,23 +83,17 @@ storage = "zocalo.configuration.plugin_storage:Storage"
 "zocalo.shutdown" = "zocalo.cli.shutdown:run"
 "zocalo.wrap" = "zocalo.cli.wrap:run"
 
-[tool.flake8]
-# Black disagrees with flake8 on a few points. Ignore those.
-ignore = "E203, E266, E501, W503"
-# E203 whitespace before ':'
-# E266 too many leading '#' for block comment
-# E501 line too long
-# W503 line break before binary operator
-max-line-length = "88"
-select = """
-E401,E711,E712,E713,E714,E721,E722,E901,
-F401,F402,F403,F405,F541,F631,F632,F633,F811,F812,F821,F822,F841,F901,
-W191,W291,W292,W293,W602,W603,W604,W605,W606,
-# flake8-comprehensions, https://github.com/adamchainz/flake8-comprehensions
-C4,"""
-
 [tool.isort]
 profile = "black"
 
 [tool.pytest.ini_options]
 required_plugins = "pytest-mock requests-mock"
+
+[tool.ruff]
+line-length = 88
+ignore = ["E501", "E741"]
+select = ["C4",  "E", "F", "W", "I"]
+unfixable = ["F841"]
+
+[tool.ruff.isort]
+required-imports = ["from __future__ import annotations"]

src/zocalo/cli/configure_rabbitmq.py

@@ -19,9 +19,11 @@
     PermissionSpec,
     PolicySpec,
     QueueSpec,
+    UserSpec,
+    VHostSpec,
+    hash_password,
 )
 from zocalo.util.rabbitmq import RabbitMQAPI as _RabbitMQAPI
-from zocalo.util.rabbitmq import UserSpec, VHostSpec, hash_password
 
 logger = logging.getLogger("zocalo.cli.configure_rabbitmq")
 

src/zocalo/service/schlockmeister.py

@@ -179,9 +179,9 @@ def update_subscriptions(self):
             if self.known_queues[destination].get("subscription"):
                 continue
             real_subscriber_count = sum(
-                map(
-                    lambda k: k not in self.known_instances,
-                    self.known_queues[destination]["subscribers"],
+                (
+                    k not in self.known_instances
+                    for k in self.known_queues[destination]["subscribers"]
                 )
             )
             if real_subscriber_count:
@@ -205,9 +205,9 @@ def garbage_collect(self):
         for destination in queues:
             if self.known_queues[destination].get("subscription"):
                 real_subscriber_count = sum(
-                    map(
-                        lambda k: k not in self.known_instances,
-                        self.known_queues[destination]["subscribers"],
+                    (
+                        k not in self.known_instances
+                        for k in self.known_queues[destination]["subscribers"]
                     )
                 )
                 if not real_subscriber_count:

src/zocalo/util/rabbitmq.py

@@ -759,9 +759,10 @@ def bindings(
         if destination_type is not None:
             endpoint = f"{endpoint}/e/{source}/{destination_type}/{destination}"
         dest_map = {"queue": "q", "exchange": "e"}
-        conv = (
-            lambda key, value: dest_map[value] if key == "destination_type" else value
-        )
+
+        def conv(key, value):
+            return dest_map[value] if key == "destination_type" else value
+
         return [
             BindingInfo(**{_r[0]: conv(_r[0], _r[1]) for _r in r.items()})
             for r in self.get(endpoint).json()
@@ -791,11 +792,10 @@ def bindings_delete(
         endpoint = f"bindings/{vhost}/e/{source}/{destination_type}/{destination}"
         if properties_key is None:
             dest_map = {"queue": "q", "exchange": "e"}
-            conv = (
-                lambda key, value: dest_map[value]
-                if key == "destination_type"
-                else value
-            )
+
+            def conv(key, value):
+                return dest_map[value] if key == "destination_type" else value
+
             props = [
                 BindingInfo(
                     **{_r[0]: conv(_r[0], _r[1]) for _r in r.items()}

tests/cli/test_dlq_purge.py

@@ -5,9 +5,8 @@
 from unittest import mock
 
 import workflows.transport
-from workflows.transport.common_transport import CommonTransport
-
 import zocalo.cli.dlq_purge as dlq_purge
+from workflows.transport.common_transport import CommonTransport
 
 
 def gen_header_activemq(i):

tests/cli/test_dlq_reinject.py

@@ -8,7 +8,6 @@
 
 import workflows.transport
 from workflows.transport.common_transport import CommonTransport
-
 from zocalo.cli.dlq_reinject import run
 
 

tests/cli/test_pickup.py

@@ -8,9 +8,8 @@
 
 import pytest
 import workflows.transport
-from workflows.transport.common_transport import CommonTransport
-
 import zocalo.configuration
+from workflows.transport.common_transport import CommonTransport
 from zocalo.cli import pickup
 
 

tests/cli/test_queue_drain.py

@@ -4,7 +4,6 @@
 
 import workflows.transport
 from workflows.transport.common_transport import CommonTransport
-
 from zocalo.cli.queue_drain import run
 
 

tests/cli/test_shutdown.py

@@ -6,7 +6,6 @@
 import workflows.transport
 from workflows.transport.common_transport import CommonTransport
 from workflows.util import generate_unique_host_id
-
 from zocalo.cli.shutdown import run