chore: merge main

GoogleCloudPlatform · Dec 9, 2024 · 861a0ce · 861a0ce
2 parents 70aa081 + 5af7582
commit 861a0ce
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/google/cloud/sql/connector/resolver.py b/google/cloud/sql/connector/resolver.py
@@ -14,10 +14,10 @@
 
 import dns.asyncresolver
 
-from google.cloud.sql.connector.connection_name import _parse_connection_name
 from google.cloud.sql.connector.connection_name import (
     _parse_connection_name_with_domain_name,
 )
+from google.cloud.sql.connector.connection_name import _parse_connection_name
 from google.cloud.sql.connector.connection_name import ConnectionName
 from google.cloud.sql.connector.exceptions import DnsResolutionError
 

diff --git a/noxfile.py b/noxfile.py
@@ -20,7 +20,7 @@
 
 import nox
 
-BLACK_VERSION = "black==23.12.1"
+BLACK_VERSION = "black==24.10.0"
 ISORT_VERSION = "isort==5.13.2"
 
 LINT_PATHS = ["google", "tests", "noxfile.py", "setup.py"]
@@ -50,7 +50,10 @@ def lint(session):
         "--fss",
         "--check-only",
         "--diff",
-        "--profile=google",
+        "--profile=black",
+        "--force-single-line-imports",
+        "--dont-order-by-type",
+        "--single-line-exclusions=typing",
         "-w=88",
         *LINT_PATHS,
     )
@@ -85,7 +88,10 @@ def format(session):
     session.run(
         "isort",
         "--fss",
-        "--profile=google",
+        "--profile=black",
+        "--force-single-line-imports",
+        "--dont-order-by-type",
+        "--single-line-exclusions=typing",
         "-w=88",
         *LINT_PATHS,
     )

diff --git a/tests/unit/test_connection_name.py b/tests/unit/test_connection_name.py
@@ -14,10 +14,10 @@
 
 import pytest  # noqa F401 Needed to run the tests
 
-from google.cloud.sql.connector.connection_name import _parse_connection_name
 from google.cloud.sql.connector.connection_name import (
     _parse_connection_name_with_domain_name,
 )
+from google.cloud.sql.connector.connection_name import _parse_connection_name
 from google.cloud.sql.connector.connection_name import ConnectionName