nox -s blacken

Author: ohmayr

docs/conf.py

@@ -32,9 +32,7 @@
 # Replace |version| in the docs with the actual version string.
 rst_epilog = """
 .. |version| replace:: {version}
-""".format(
-    version=version
-)
+""".format(version=version)
 
 # -- General configuration ---------------------------------------------------
 

gapic/cli/generate.py

@@ -38,7 +38,7 @@
     "--output",
     type=click.File("wb"),
     default=sys.stdout.buffer,
-    help="Where to output the `CodeGeneratorResponse`. " "Defaults to stdout.",
+    help="Where to output the `CodeGeneratorResponse`. Defaults to stdout.",
 )
 def generate(request: typing.BinaryIO, output: typing.BinaryIO) -> None:
     """Generate a full API client description."""

gapic/generator/generator.py

@@ -131,9 +131,7 @@ def get_response(self, api_schema: api.API, opts: Options) -> CodeGeneratorRespo
             )
 
         # Return the CodeGeneratorResponse output.
-        res = CodeGeneratorResponse(
-            file=[i for i in output_files.values()]
-        )  # type: ignore
+        res = CodeGeneratorResponse(file=[i for i in output_files.values()])  # type: ignore
         res.supported_features |= CodeGeneratorResponse.Feature.FEATURE_PROTO3_OPTIONAL  # type: ignore
         return res
 

gapic/samplegen_utils/snippet_index.py

@@ -117,7 +117,9 @@ def __init__(self, api_schema: api.API):
         self.metadata_index.client_library.name = (
             api_schema.naming.warehouse_package_name
         )
-        self.metadata_index.client_library.language = snippet_metadata_pb2.Language.PYTHON  # type: ignore
+        self.metadata_index.client_library.language = (
+            snippet_metadata_pb2.Language.PYTHON
+        )  # type: ignore
 
         self.metadata_index.client_library.version = api_schema.gapic_version
 

gapic/samplegen_utils/yaml.py

@@ -116,7 +116,9 @@ def get(self, key, default=None):
         return next(
             iter(
                 [
-                    e.val for e in self.elements if e.key == key  # type: ignore
+                    e.val
+                    for e in self.elements
+                    if e.key == key  # type: ignore
                 ]  # type: ignore
             ),
             default,

gapic/schema/api.py

@@ -941,11 +941,7 @@ def enforce_valid_library_settings(
             selective_gapic_errors = {}
             # TODO(https://github.com/googleapis/gapic-generator-python/issues/2446):
             # Workaround issue in Python 3.14 related to code coverage by adding `# pragma: no branch`
-            for (
-                method_name
-            ) in (
-                library_settings.python_settings.common.selective_gapic_generation.methods
-            ):  # pragma: no branch
+            for method_name in library_settings.python_settings.common.selective_gapic_generation.methods:  # pragma: no branch
                 if method_name not in self.all_methods:
                     selective_gapic_errors[method_name] = "Method does not exist."
                 elif not method_name.startswith(library_settings.version):
@@ -1180,8 +1176,7 @@ def __init__(
                 object.__setattr__(field, "enum", maybe_enum_type)
             else:
                 raise TypeError(
-                    f"Unknown type referenced in "
-                    f"{self.file_descriptor.name}: '{key}'"
+                    f"Unknown type referenced in {self.file_descriptor.name}: '{key}'"
                 )
 
         # Only generate the service if this is a target file to be generated.

gapic/schema/metadata.py

@@ -356,7 +356,7 @@ def resolve(self, selector: str) -> str:
             str: An absolute selector.
         """
         if "." not in selector:
-            return f'{".".join(self.package)}.{selector}'
+            return f"{'.'.join(self.package)}.{selector}"
         return selector
 
     def with_context(self, *, collisions: Set[str]) -> "Address":

gapic/schema/naming.py

@@ -86,7 +86,7 @@ def build(
                 "The protos provided do not share a common root package. "
                 "Ensure that all explicitly-specified protos are for a "
                 "single API. "
-                f'The packages we got are: {", ".join(proto_packages)}'
+                f"The packages we got are: {', '.join(proto_packages)}"
             )
 
         # Define the valid regex to split the package.

gapic/schema/wrappers.py

@@ -797,7 +797,7 @@ def get_field(
         # Quick check: If this cursor has no message, there is a problem.
         if not cursor.message:
             raise KeyError(
-                f'Field {".".join(field_path)} could not be resolved from '
+                f"Field {'.'.join(field_path)} could not be resolved from "
                 f"{cursor.name}.",
             )
 

noxfile.py

@@ -67,7 +67,7 @@ def unit(session):
         "grpcio-status",
         "proto-plus",
     )
-    session.install("-e", ".")
+    # session.install("-e", ".")
     session.run(
         "py.test",
         *(
@@ -82,6 +82,7 @@ def unit(session):
                 path.join("tests", "unit"),
             ]
         ),
+        external=True,
     )
 
 
@@ -296,7 +297,7 @@ def showcase_library(
                     }
                 ]
                 update_service_yaml = _add_python_settings(tmp_dir, python_settings)
-                session.run("python", "-c" f"{update_service_yaml}")
+                session.run("python", f"-c{update_service_yaml}")
             # END TODO section to remove.
         if retry_config:
             session.run(
@@ -765,7 +766,8 @@ def lint(session):
         "format",
         "--check",
         *LINT_PATHS,
-        "--exclude", RUFF_EXCLUDES,
+        "--exclude",
+        RUFF_EXCLUDES,
     )
 
     # 3. Run Flake8
@@ -779,22 +781,25 @@ def lint(session):
 @nox.session(python="3.10")
 def blacken(session):
     """Run ruff format.
-    
+
     DEPRECATED: This session now uses Ruff instead of Black.
     It formats code style only (indentation, quotes, etc).
     """
-    session.log("WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future.")
-    
-    
+    session.log(
+        "WARNING: The 'blacken' session is deprecated and will be removed in the next release. Please use 'nox -s format' in the future."
+    )
+
     session.install(RUFF_VERSION)
-    
+
     # 1. Format Code (Replaces black)
     # We do NOT run 'ruff check --select I' here, preserving strict parity.
     session.run(
         "ruff",
         "format",
+        "--line-length=88",  # Standard Black line length
         *LINT_PATHS,
-        "--exclude", RUFF_EXCLUDES,
+        "--exclude",
+        RUFF_EXCLUDES,
     )