Use ruff format instead of black/isort

Author: philpep

.pre-commit-config.yaml

@@ -32,18 +32,11 @@ repos:
       entry: ruff check
       language: system
       types: [python]
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        args:
-          # https://github.com/pre-commit/mirrors-isort/issues/9#issuecomment-624404082
-          - --filter-files
-  - repo: https://github.com/psf/black
-    rev: 22.10.0
-    hooks:
-      - id: black
-        language_version: python3
+    - id: ruff-format
+      name: ruff
+      entry: ruff format --check --diff
+      language: system
+      types: [python]
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.4.1
     hooks:

test/conftest.py

@@ -72,7 +72,7 @@ def setup_ansible_config(tmpdir, name, host, user, port, key):
     tmpdir.join("inventory").write("[testgroup]\n" + " ".join(items) + "\n")
     tmpdir.mkdir("host_vars").join(name).write(ANSIBLE_HOSTVARS)
     tmpdir.mkdir("group_vars").join("testgroup").write(
-        "---\n" "myhostvar: should_be_overriden\n" "mygroupvar: qux\n"
+        "---\nmyhostvar: should_be_overriden\nmygroupvar: qux\n"
     )
     vault_password_file = tmpdir.join("vault-pass.txt")
     vault_password_file.write("polichinelle\n")

test/test_backends.py

@@ -96,7 +96,7 @@ def test_encoding(host):
             b"Aucun fichier ou dossier de ce type\n"
         )
         assert cmd.stderr == (
-            "ls: impossible d'accéder à '/é': " "Aucun fichier ou dossier de ce type\n"
+            "ls: impossible d'accéder à '/é': Aucun fichier ou dossier de ce type\n"
         )
 
 
@@ -415,7 +415,7 @@ def test_ansible_config():
     # test testinfra use ANSIBLE_CONFIG
     tmp = tempfile.NamedTemporaryFile
     with tmp(suffix=".cfg") as cfg, tmp() as inventory:
-        cfg.write(b"[defaults]\n" b"inventory=" + inventory.name.encode() + b"\n")
+        cfg.write(b"[defaults]\ninventory=" + inventory.name.encode() + b"\n")
         cfg.flush()
         inventory.write(b"h\n")
         inventory.flush()

test/test_modules.py

@@ -375,7 +375,7 @@ def test_ansible_module(host):
     except host.ansible.AnsibleException as exc:
         assert exc.result["rc"] == 2
         # notez que the debian bookworm container is set to LANG=fr_FR
-        assert exc.result["msg"] == ("[Errno 2] Aucun fichier ou dossier " "de ce type")
+        assert exc.result["msg"] == ("[Errno 2] Aucun fichier ou dossier de ce type")
 
     result = host.ansible("command", "echo foo", check=False)
     assert result["stdout"] == "foo"
@@ -622,12 +622,9 @@ def test_ip6tables(host):
     try:
         v6_rules = host.iptables.rules(version=6)
     except AssertionError as exc_info:
-        if (
-            "Perhaps ip6tables or your kernel needs to "
-            "be upgraded" in exc_info.args[0]
-        ):
+        if "Perhaps ip6tables or your kernel needs to be upgraded" in exc_info.args[0]:
             pytest.skip(
-                f"IPV6 does not seem to be enabled on the docker host" f"\n{exc_info}"
+                f"IPV6 does not seem to be enabled on the docker host\n{exc_info}"
             )
         else:
             raise

testinfra/backend/lxc.py

@@ -25,7 +25,7 @@ def __init__(self, name: str, *args: Any, **kwargs: Any):
     def run(self, command: str, *args: str, **kwargs: Any) -> base.CommandResult:
         cmd = self.get_command(command, *args)
         out = self.run_local(
-            "lxc exec %s --mode=non-interactive -- " "/bin/sh -c %s", self.name, cmd
+            "lxc exec %s --mode=non-interactive -- /bin/sh -c %s", self.name, cmd
         )
         out.command = self.encode(cmd)
         return out

testinfra/backend/salt.py

@@ -51,7 +51,7 @@ def run_salt(self, func: str, args: Any = None) -> Any:
         out = self.client.cmd(self.host, func, args or [])
         if self.host not in out:
             raise RuntimeError(
-                f"Error while running {func}({args}): {out}. " "Minion not connected ?"
+                f"Error while running {func}({args}): {out}. Minion not connected ?"
             )
         return out[self.host]
 

testinfra/modules/ansible.py

@@ -38,7 +38,7 @@ def need_ansible(func):
     def wrapper(self, *args, **kwargs):
         if not self._host.backend.HAS_RUN_ANSIBLE:
             raise RuntimeError(
-                "Ansible module is only available with ansible " "connection backend"
+                "Ansible module is only available with ansible connection backend"
             )
         return func(self, *args, **kwargs)
 

testinfra/modules/process.py

@@ -82,9 +82,9 @@ def filter(self, **filters):
                 if str(attrs[key]) != str(value):
                     break
             else:
-                attrs[
-                    "_get_process_attribute_by_pid"
-                ] = self._get_process_attribute_by_pid
+                attrs["_get_process_attribute_by_pid"] = (
+                    self._get_process_attribute_by_pid
+                )
                 match.append(_Process(attrs))
         return match
 

testinfra/modules/user.py

@@ -232,7 +232,7 @@ def gids(self):
     def groups(self):
         """Return the list of user local group names"""
         local_groups = self.check_output(
-            'net user %s | findstr /B /C:"Local ' 'Group Memberships"', self.name
+            'net user %s | findstr /B /C:"Local Group Memberships"', self.name
         )
         local_groups = local_groups.split()[3:]
         return [g.replace("*", "") for g in local_groups]

testinfra/plugin.py

@@ -162,7 +162,7 @@ def report(self) -> int:
 
         out = sys.stdout.buffer
         out.write(
-            (b"TESTINFRA %s - %d passed, %d failed, %d skipped in %.2f " b"seconds\n")
+            (b"TESTINFRA %s - %d passed, %d failed, %d skipped in %.2f seconds\n")
             % (
                 status,
                 self.passed,