chore(python): use ubuntu 22.04 in docs image (#377)

Source-Link: googleapis/synthtool@f15cc72
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:bc5eed3804aec2f05fad42aacf973821d9500c174015341f721a984a0825b6fd

dlp/snippets/deid_test.py

@@ -17,7 +17,6 @@
 import tempfile
 
 import google.cloud.dlp_v2
-
 import pytest
 
 import deid

dlp/snippets/inspect_content.py

@@ -466,15 +466,15 @@ def inspect_gcs_file(
     """
 
     # Import the client library.
+    # This sample also uses threading.Event() to wait for the job to finish.
+    import threading
+
     import google.cloud.dlp
 
     # This sample additionally uses Cloud Pub/Sub to receive results from
     # potentially long-running operations.
     import google.cloud.pubsub
 
-    # This sample also uses threading.Event() to wait for the job to finish.
-    import threading
-
     # Instantiate a client.
     dlp = google.cloud.dlp_v2.DlpServiceClient()
 
@@ -626,15 +626,15 @@ def inspect_datastore(
     """
 
     # Import the client library.
+    # This sample also uses threading.Event() to wait for the job to finish.
+    import threading
+
     import google.cloud.dlp
 
     # This sample additionally uses Cloud Pub/Sub to receive results from
     # potentially long-running operations.
     import google.cloud.pubsub
 
-    # This sample also uses threading.Event() to wait for the job to finish.
-    import threading
-
     # Instantiate a client.
     dlp = google.cloud.dlp_v2.DlpServiceClient()
 
@@ -796,15 +796,15 @@ def inspect_bigquery(
     """
 
     # Import the client library.
+    # This sample also uses threading.Event() to wait for the job to finish.
+    import threading
+
     import google.cloud.dlp
 
     # This sample additionally uses Cloud Pub/Sub to receive results from
     # potentially long-running operations.
     import google.cloud.pubsub
 
-    # This sample also uses threading.Event() to wait for the job to finish.
-    import threading
-
     # Instantiate a client.
     dlp = google.cloud.dlp_v2.DlpServiceClient()
 

dlp/snippets/inspect_content_test.py

@@ -28,7 +28,6 @@
 
 import inspect_content
 
-
 UNIQUE_STRING = str(uuid.uuid4()).split("-")[0]
 
 GCLOUD_PROJECT = os.getenv("GOOGLE_CLOUD_PROJECT")

dlp/snippets/noxfile.py

@@ -22,14 +22,14 @@
 
 import nox
 
-
 # WARNING - WARNING - WARNING - WARNING - WARNING
 # WARNING - WARNING - WARNING - WARNING - WARNING
 #           DO NOT EDIT THIS FILE EVER!
 # WARNING - WARNING - WARNING - WARNING - WARNING
 # WARNING - WARNING - WARNING - WARNING - WARNING
 
 BLACK_VERSION = "black==22.3.0"
+ISORT_VERSION = "isort==5.10.1"
 
 # Copy `noxfile_config.py` to your directory and modify it instead.
 
@@ -168,12 +168,33 @@ def lint(session: nox.sessions.Session) -> None:
 
 @nox.session
 def blacken(session: nox.sessions.Session) -> None:
+    """Run black. Format code to uniform standard."""
     session.install(BLACK_VERSION)
     python_files = [path for path in os.listdir(".") if path.endswith(".py")]
 
     session.run("black", *python_files)
 
 
+#
+# format = isort + black
+#
+
+
+@nox.session
+def format(session: nox.sessions.Session) -> None:
+    """
+    Run isort to sort imports. Then run black
+    to format code to uniform standard.
+    """
+    session.install(BLACK_VERSION, ISORT_VERSION)
+    python_files = [path for path in os.listdir(".") if path.endswith(".py")]
+
+    # Use the --fss option to sort imports using strict alphabetical order.
+    # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections
+    session.run("isort", "--fss", *python_files)
+    session.run("black", *python_files)
+
+
 #
 # Sample Tests
 #

dlp/snippets/quickstart_test.py

@@ -16,7 +16,6 @@
 
 import quickstart
 
-
 GCLOUD_PROJECT = os.getenv("GOOGLE_CLOUD_PROJECT")
 
 

dlp/snippets/redact.py

@@ -25,7 +25,6 @@
 # [END dlp_redact_image]
 import os
 
-
 # [START dlp_redact_image]
 
 

dlp/snippets/risk_test.py

@@ -21,7 +21,6 @@
 
 import risk
 
-
 UNIQUE_STRING = str(uuid.uuid4()).split("-")[0]
 GCLOUD_PROJECT = os.environ.get("GOOGLE_CLOUD_PROJECT")
 TABLE_PROJECT = os.environ.get("GOOGLE_CLOUD_PROJECT")

dlp/snippets/triggers_test.py

@@ -17,7 +17,6 @@
 
 import google.api_core.exceptions
 import google.cloud.storage
-
 import pytest
 
 import triggers