Move Black to pre-commit

.pre-commit-config.yaml

@@ -18,6 +18,13 @@ repos:
         name: "Python: imports"
         args: ["--py39-plus"]
 
+  - repo: "https://github.com/psf/black-pre-commit-mirror"
+    rev: "24.10.0"
+    hooks:
+      - id: "black"
+        name: "Python: format"
+        args: ["--target-version", "py39", "--line-length", "120"]
+
   - repo: "https://github.com/pre-commit/pre-commit-hooks"
     rev: "v5.0.0"
     hooks:

setup.cfg

@@ -8,7 +8,9 @@ max-line-length = 120
 #
 # https://www.flake8rules.com/rules/W503.html
 # https://www.python.org/dev/peps/pep-0008/#should-a-line-break-before-or-after-a-binary-operator
-ignore = W503
+#
+# E203 and E701 are Black-specific exclusions.
+ignore = E203,E701,W503
 
 [mypy]
 check_untyped_defs = true

setup.py

@@ -27,27 +27,30 @@
     readme = f.read()
 
 kerberos_require = ["requests_kerberos"]
-gssapi_require = [""
-                  "requests_gssapi",
-                  # PyPy compatibility issue https://github.com/jborean93/pykrb5/issues/49
-                  "krb5 == 0.5.1"]
+gssapi_require = [
+    "" "requests_gssapi",
+    # PyPy compatibility issue https://github.com/jborean93/pykrb5/issues/49
+    "krb5 == 0.5.1",
+]
 sqlalchemy_require = ["sqlalchemy >= 1.3"]
 external_authentication_token_cache_require = ["keyring"]
 
 # We don't add localstorage_require to all_require as users must explicitly opt in to use keyring.
 all_require = kerberos_require + sqlalchemy_require
 
-tests_require = all_require + gssapi_require + [
-    # httpretty >= 1.1 duplicates requests in `httpretty.latest_requests`
-    # https://github.com/gabrielfalcao/HTTPretty/issues/425
-    "httpretty < 1.1",
-    "pytest",
-    "pytest-runner",
-    "pre-commit",
-    "black",
-    "isort",
-    "keyring"
-]
+tests_require = (
+    all_require
+    + gssapi_require
+    + [
+        # httpretty >= 1.1 duplicates requests in `httpretty.latest_requests`
+        # https://github.com/gabrielfalcao/HTTPretty/issues/425
+        "httpretty < 1.1",
+        "pytest",
+        "pytest-runner",
+        "pre-commit",
+        "keyring",
+    ]
+)
 
 setup(
     name=about["__title__"],

tests/integration/conftest.py

@@ -72,13 +72,7 @@ def start_trino(image_tag=None):
 
 
 def wait_for_trino_workers(host, port, timeout=180):
-    request = TrinoRequest(
-        host=host,
-        port=port,
-        client_session=ClientSession(
-            user="test_fixture"
-        )
-    )
+    request = TrinoRequest(host=host, port=port, client_session=ClientSession(user="test_fixture"))
     sql = "SELECT state FROM system.runtime.nodes"
     t0 = time.time()
     while True:
@@ -124,9 +118,7 @@ def start_trino_and_wait(image_tag=None):
     if host:
         port = os.environ.get("TRINO_RUNNING_PORT", DEFAULT_PORT)
     else:
-        container_id, proc, host, port = start_local_trino_server(
-            image_tag
-        )
+        container_id, proc, host, port = start_local_trino_server(image_tag)
 
     print("trino.server.hostname {}".format(host))
     print("trino.server.port {}".format(port))