From a291cd7df9d50a5fa0c035caa660e793256e27ab Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Apr 2022 20:33:09 -0400
Subject: [PATCH] chore(python): add nox session to sort python imports (#68)

Source-Link: https://github.com/googleapis/synthtool/commit/1b71c10e20de7ed3f97f692f99a0e3399b67049f
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .../.github/.OwlBot.lock.yaml                 |  4 +-
 packages/google-cloud-deploy/docs/conf.py     |  2 +-
 .../google/cloud/deploy/__init__.py           | 89 +++++++++---------
 .../google/cloud/deploy_v1/__init__.py        | 90 +++++++++----------
 .../services/cloud_deploy/__init__.py         |  2 +-
 .../services/cloud_deploy/async_client.py     | 14 +--
 .../deploy_v1/services/cloud_deploy/client.py | 12 +--
 .../deploy_v1/services/cloud_deploy/pagers.py |  4 +-
 .../cloud_deploy/transports/__init__.py       |  1 -
 .../services/cloud_deploy/transports/base.py  |  9 +-
 .../services/cloud_deploy/transports/grpc.py  | 12 ++-
 .../cloud_deploy/transports/grpc_asyncio.py   | 12 ++-
 .../google/cloud/deploy_v1/types/__init__.py  | 20 ++---
 .../cloud/deploy_v1/types/cloud_deploy.py     |  4 +-
 .../deliverypipeline_notification_payload.py  |  1 -
 .../google/cloud/deploy_v1/types/log_enums.py |  1 -
 .../types/release_notification_payload.py     |  1 -
 .../deploy_v1/types/release_render_payload.py |  1 -
 .../types/rollout_notification_payload.py     |  1 -
 .../types/target_notification_payload.py      |  1 -
 packages/google-cloud-deploy/noxfile.py       | 28 +++++-
 packages/google-cloud-deploy/setup.py         |  1 -
 .../unit/gapic/deploy_v1/test_cloud_deploy.py | 45 +++++-----
 23 files changed, 180 insertions(+), 175 deletions(-)

diff --git a/packages/google-cloud-deploy/.github/.OwlBot.lock.yaml b/packages/google-cloud-deploy/.github/.OwlBot.lock.yaml
index bc893c979e20..7c454abf76f3 100644
--- a/packages/google-cloud-deploy/.github/.OwlBot.lock.yaml
+++ b/packages/google-cloud-deploy/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:8a5d3f6a2e43ed8293f34e06a2f56931d1e88a2694c3bb11b15df4eb256ad163
-# created: 2022-04-06T10:30:21.687684602Z
+  digest: sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416
+# created: 2022-04-20T23:42:53.970438194Z
diff --git a/packages/google-cloud-deploy/docs/conf.py b/packages/google-cloud-deploy/docs/conf.py
index ac2413acb9a2..f072ddefbb26 100644
--- a/packages/google-cloud-deploy/docs/conf.py
+++ b/packages/google-cloud-deploy/docs/conf.py
@@ -24,9 +24,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
 import shlex
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
diff --git a/packages/google-cloud-deploy/google/cloud/deploy/__init__.py b/packages/google-cloud-deploy/google/cloud/deploy/__init__.py
index fc03c52cbaf2..0bbc35d5b0fb 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy/__init__.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy/__init__.py
@@ -14,53 +14,54 @@
 # limitations under the License.
 #
 
-from google.cloud.deploy_v1.services.cloud_deploy.client import CloudDeployClient
 from google.cloud.deploy_v1.services.cloud_deploy.async_client import (
     CloudDeployAsyncClient,
 )
-
-from google.cloud.deploy_v1.types.cloud_deploy import AnthosCluster
-from google.cloud.deploy_v1.types.cloud_deploy import ApproveRolloutRequest
-from google.cloud.deploy_v1.types.cloud_deploy import ApproveRolloutResponse
-from google.cloud.deploy_v1.types.cloud_deploy import BuildArtifact
-from google.cloud.deploy_v1.types.cloud_deploy import Config
-from google.cloud.deploy_v1.types.cloud_deploy import CreateDeliveryPipelineRequest
-from google.cloud.deploy_v1.types.cloud_deploy import CreateReleaseRequest
-from google.cloud.deploy_v1.types.cloud_deploy import CreateRolloutRequest
-from google.cloud.deploy_v1.types.cloud_deploy import CreateTargetRequest
-from google.cloud.deploy_v1.types.cloud_deploy import DefaultPool
-from google.cloud.deploy_v1.types.cloud_deploy import DeleteDeliveryPipelineRequest
-from google.cloud.deploy_v1.types.cloud_deploy import DeleteTargetRequest
-from google.cloud.deploy_v1.types.cloud_deploy import DeliveryPipeline
-from google.cloud.deploy_v1.types.cloud_deploy import ExecutionConfig
-from google.cloud.deploy_v1.types.cloud_deploy import GetConfigRequest
-from google.cloud.deploy_v1.types.cloud_deploy import GetDeliveryPipelineRequest
-from google.cloud.deploy_v1.types.cloud_deploy import GetReleaseRequest
-from google.cloud.deploy_v1.types.cloud_deploy import GetRolloutRequest
-from google.cloud.deploy_v1.types.cloud_deploy import GetTargetRequest
-from google.cloud.deploy_v1.types.cloud_deploy import GkeCluster
-from google.cloud.deploy_v1.types.cloud_deploy import ListDeliveryPipelinesRequest
-from google.cloud.deploy_v1.types.cloud_deploy import ListDeliveryPipelinesResponse
-from google.cloud.deploy_v1.types.cloud_deploy import ListReleasesRequest
-from google.cloud.deploy_v1.types.cloud_deploy import ListReleasesResponse
-from google.cloud.deploy_v1.types.cloud_deploy import ListRolloutsRequest
-from google.cloud.deploy_v1.types.cloud_deploy import ListRolloutsResponse
-from google.cloud.deploy_v1.types.cloud_deploy import ListTargetsRequest
-from google.cloud.deploy_v1.types.cloud_deploy import ListTargetsResponse
-from google.cloud.deploy_v1.types.cloud_deploy import OperationMetadata
-from google.cloud.deploy_v1.types.cloud_deploy import PipelineCondition
-from google.cloud.deploy_v1.types.cloud_deploy import PipelineReadyCondition
-from google.cloud.deploy_v1.types.cloud_deploy import PrivatePool
-from google.cloud.deploy_v1.types.cloud_deploy import Release
-from google.cloud.deploy_v1.types.cloud_deploy import Rollout
-from google.cloud.deploy_v1.types.cloud_deploy import SerialPipeline
-from google.cloud.deploy_v1.types.cloud_deploy import SkaffoldVersion
-from google.cloud.deploy_v1.types.cloud_deploy import Stage
-from google.cloud.deploy_v1.types.cloud_deploy import Target
-from google.cloud.deploy_v1.types.cloud_deploy import TargetArtifact
-from google.cloud.deploy_v1.types.cloud_deploy import TargetsPresentCondition
-from google.cloud.deploy_v1.types.cloud_deploy import UpdateDeliveryPipelineRequest
-from google.cloud.deploy_v1.types.cloud_deploy import UpdateTargetRequest
+from google.cloud.deploy_v1.services.cloud_deploy.client import CloudDeployClient
+from google.cloud.deploy_v1.types.cloud_deploy import (
+    AnthosCluster,
+    ApproveRolloutRequest,
+    ApproveRolloutResponse,
+    BuildArtifact,
+    Config,
+    CreateDeliveryPipelineRequest,
+    CreateReleaseRequest,
+    CreateRolloutRequest,
+    CreateTargetRequest,
+    DefaultPool,
+    DeleteDeliveryPipelineRequest,
+    DeleteTargetRequest,
+    DeliveryPipeline,
+    ExecutionConfig,
+    GetConfigRequest,
+    GetDeliveryPipelineRequest,
+    GetReleaseRequest,
+    GetRolloutRequest,
+    GetTargetRequest,
+    GkeCluster,
+    ListDeliveryPipelinesRequest,
+    ListDeliveryPipelinesResponse,
+    ListReleasesRequest,
+    ListReleasesResponse,
+    ListRolloutsRequest,
+    ListRolloutsResponse,
+    ListTargetsRequest,
+    ListTargetsResponse,
+    OperationMetadata,
+    PipelineCondition,
+    PipelineReadyCondition,
+    PrivatePool,
+    Release,
+    Rollout,
+    SerialPipeline,
+    SkaffoldVersion,
+    Stage,
+    Target,
+    TargetArtifact,
+    TargetsPresentCondition,
+    UpdateDeliveryPipelineRequest,
+    UpdateTargetRequest,
+)
 from google.cloud.deploy_v1.types.deliverypipeline_notification_payload import (
     DeliveryPipelineNotificationEvent,
 )
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py
index 7f22fb90372a..a5ffd9459e68 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/__init__.py
@@ -14,51 +14,51 @@
 # limitations under the License.
 #
 
-from .services.cloud_deploy import CloudDeployClient
-from .services.cloud_deploy import CloudDeployAsyncClient
-
-from .types.cloud_deploy import AnthosCluster
-from .types.cloud_deploy import ApproveRolloutRequest
-from .types.cloud_deploy import ApproveRolloutResponse
-from .types.cloud_deploy import BuildArtifact
-from .types.cloud_deploy import Config
-from .types.cloud_deploy import CreateDeliveryPipelineRequest
-from .types.cloud_deploy import CreateReleaseRequest
-from .types.cloud_deploy import CreateRolloutRequest
-from .types.cloud_deploy import CreateTargetRequest
-from .types.cloud_deploy import DefaultPool
-from .types.cloud_deploy import DeleteDeliveryPipelineRequest
-from .types.cloud_deploy import DeleteTargetRequest
-from .types.cloud_deploy import DeliveryPipeline
-from .types.cloud_deploy import ExecutionConfig
-from .types.cloud_deploy import GetConfigRequest
-from .types.cloud_deploy import GetDeliveryPipelineRequest
-from .types.cloud_deploy import GetReleaseRequest
-from .types.cloud_deploy import GetRolloutRequest
-from .types.cloud_deploy import GetTargetRequest
-from .types.cloud_deploy import GkeCluster
-from .types.cloud_deploy import ListDeliveryPipelinesRequest
-from .types.cloud_deploy import ListDeliveryPipelinesResponse
-from .types.cloud_deploy import ListReleasesRequest
-from .types.cloud_deploy import ListReleasesResponse
-from .types.cloud_deploy import ListRolloutsRequest
-from .types.cloud_deploy import ListRolloutsResponse
-from .types.cloud_deploy import ListTargetsRequest
-from .types.cloud_deploy import ListTargetsResponse
-from .types.cloud_deploy import OperationMetadata
-from .types.cloud_deploy import PipelineCondition
-from .types.cloud_deploy import PipelineReadyCondition
-from .types.cloud_deploy import PrivatePool
-from .types.cloud_deploy import Release
-from .types.cloud_deploy import Rollout
-from .types.cloud_deploy import SerialPipeline
-from .types.cloud_deploy import SkaffoldVersion
-from .types.cloud_deploy import Stage
-from .types.cloud_deploy import Target
-from .types.cloud_deploy import TargetArtifact
-from .types.cloud_deploy import TargetsPresentCondition
-from .types.cloud_deploy import UpdateDeliveryPipelineRequest
-from .types.cloud_deploy import UpdateTargetRequest
+from .services.cloud_deploy import CloudDeployAsyncClient, CloudDeployClient
+from .types.cloud_deploy import (
+    AnthosCluster,
+    ApproveRolloutRequest,
+    ApproveRolloutResponse,
+    BuildArtifact,
+    Config,
+    CreateDeliveryPipelineRequest,
+    CreateReleaseRequest,
+    CreateRolloutRequest,
+    CreateTargetRequest,
+    DefaultPool,
+    DeleteDeliveryPipelineRequest,
+    DeleteTargetRequest,
+    DeliveryPipeline,
+    ExecutionConfig,
+    GetConfigRequest,
+    GetDeliveryPipelineRequest,
+    GetReleaseRequest,
+    GetRolloutRequest,
+    GetTargetRequest,
+    GkeCluster,
+    ListDeliveryPipelinesRequest,
+    ListDeliveryPipelinesResponse,
+    ListReleasesRequest,
+    ListReleasesResponse,
+    ListRolloutsRequest,
+    ListRolloutsResponse,
+    ListTargetsRequest,
+    ListTargetsResponse,
+    OperationMetadata,
+    PipelineCondition,
+    PipelineReadyCondition,
+    PrivatePool,
+    Release,
+    Rollout,
+    SerialPipeline,
+    SkaffoldVersion,
+    Stage,
+    Target,
+    TargetArtifact,
+    TargetsPresentCondition,
+    UpdateDeliveryPipelineRequest,
+    UpdateTargetRequest,
+)
 from .types.deliverypipeline_notification_payload import (
     DeliveryPipelineNotificationEvent,
 )
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/__init__.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/__init__.py
index 05c2b17f21cf..ab465648df4b 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/__init__.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/__init__.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .client import CloudDeployClient
 from .async_client import CloudDeployAsyncClient
+from .client import CloudDeployClient
 
 __all__ = (
     "CloudDeployClient",
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py
index 43fd94381fc6..a663b8c75539 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/async_client.py
@@ -17,14 +17,14 @@
 import functools
 import re
 from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
-import pkg_resources
 
-from google.api_core.client_options import ClientOptions
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import pkg_resources
 
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -33,14 +33,16 @@
 
 from google.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
-from google.cloud.deploy_v1.services.cloud_deploy import pagers
-from google.cloud.deploy_v1.types import cloud_deploy
 from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf import field_mask_pb2  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
-from .transports.base import CloudDeployTransport, DEFAULT_CLIENT_INFO
-from .transports.grpc_asyncio import CloudDeployGrpcAsyncIOTransport
+
+from google.cloud.deploy_v1.services.cloud_deploy import pagers
+from google.cloud.deploy_v1.types import cloud_deploy
+
 from .client import CloudDeployClient
+from .transports.base import DEFAULT_CLIENT_INFO, CloudDeployTransport
+from .transports.grpc_asyncio import CloudDeployGrpcAsyncIOTransport
 
 
 class CloudDeployAsyncClient:
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py
index b24f62ac9c47..007edec7cb1a 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/client.py
@@ -17,17 +17,17 @@
 import os
 import re
 from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
-import pkg_resources
 
 from google.api_core import client_options as client_options_lib
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
+from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.auth.transport import mtls  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
-from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import pkg_resources
 
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -36,12 +36,14 @@
 
 from google.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
-from google.cloud.deploy_v1.services.cloud_deploy import pagers
-from google.cloud.deploy_v1.types import cloud_deploy
 from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf import field_mask_pb2  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
-from .transports.base import CloudDeployTransport, DEFAULT_CLIENT_INFO
+
+from google.cloud.deploy_v1.services.cloud_deploy import pagers
+from google.cloud.deploy_v1.types import cloud_deploy
+
+from .transports.base import DEFAULT_CLIENT_INFO, CloudDeployTransport
 from .transports.grpc import CloudDeployGrpcTransport
 from .transports.grpc_asyncio import CloudDeployGrpcAsyncIOTransport
 
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py
index e59c525d77b1..e9d70fff43b6 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/pagers.py
@@ -18,10 +18,10 @@
     AsyncIterator,
     Awaitable,
     Callable,
+    Iterator,
+    Optional,
     Sequence,
     Tuple,
-    Optional,
-    Iterator,
 )
 
 from google.cloud.deploy_v1.types import cloud_deploy
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/__init__.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/__init__.py
index c85a569a3985..bc60ea097382 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/__init__.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/__init__.py
@@ -20,7 +20,6 @@
 from .grpc import CloudDeployGrpcTransport
 from .grpc_asyncio import CloudDeployGrpcAsyncIOTransport
 
-
 # Compile a registry of transports.
 _transport_registry = OrderedDict()  # type: Dict[str, Type[CloudDeployTransport]]
 _transport_registry["grpc"] = CloudDeployGrpcTransport
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py
index afff9602a9f8..5874abd25b3e 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/base.py
@@ -15,19 +15,18 @@
 #
 import abc
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
-import pkg_resources
 
-import google.auth  # type: ignore
 import google.api_core
 from google.api_core import exceptions as core_exceptions
-from google.api_core import gapic_v1
+from google.api_core import gapic_v1, operations_v1
 from google.api_core import retry as retries
-from google.api_core import operations_v1
+import google.auth  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
+from google.longrunning import operations_pb2  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import pkg_resources
 
 from google.cloud.deploy_v1.types import cloud_deploy
-from google.longrunning import operations_pb2  # type: ignore
 
 try:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py
index 95da0107fda5..ff8f66857d48 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc.py
@@ -13,21 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import warnings
 from typing import Callable, Dict, Optional, Sequence, Tuple, Union
+import warnings
 
-from google.api_core import grpc_helpers
-from google.api_core import operations_v1
-from google.api_core import gapic_v1
+from google.api_core import gapic_v1, grpc_helpers, operations_v1
 import google.auth  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
-
+from google.longrunning import operations_pb2  # type: ignore
 import grpc  # type: ignore
 
 from google.cloud.deploy_v1.types import cloud_deploy
-from google.longrunning import operations_pb2  # type: ignore
-from .base import CloudDeployTransport, DEFAULT_CLIENT_INFO
+
+from .base import DEFAULT_CLIENT_INFO, CloudDeployTransport
 
 
 class CloudDeployGrpcTransport(CloudDeployTransport):
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py
index 5800b361b2e1..951107502b5a 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/services/cloud_deploy/transports/grpc_asyncio.py
@@ -13,21 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import warnings
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
+import warnings
 
-from google.api_core import gapic_v1
-from google.api_core import grpc_helpers_async
-from google.api_core import operations_v1
+from google.api_core import gapic_v1, grpc_helpers_async, operations_v1
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
-
+from google.longrunning import operations_pb2  # type: ignore
 import grpc  # type: ignore
 from grpc.experimental import aio  # type: ignore
 
 from google.cloud.deploy_v1.types import cloud_deploy
-from google.longrunning import operations_pb2  # type: ignore
-from .base import CloudDeployTransport, DEFAULT_CLIENT_INFO
+
+from .base import DEFAULT_CLIENT_INFO, CloudDeployTransport
 from .grpc import CloudDeployGrpcTransport
 
 
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py
index 594bd939567a..10f81da98df3 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/__init__.py
@@ -57,21 +57,11 @@
     UpdateDeliveryPipelineRequest,
     UpdateTargetRequest,
 )
-from .deliverypipeline_notification_payload import (
-    DeliveryPipelineNotificationEvent,
-)
-from .release_notification_payload import (
-    ReleaseNotificationEvent,
-)
-from .release_render_payload import (
-    ReleaseRenderEvent,
-)
-from .rollout_notification_payload import (
-    RolloutNotificationEvent,
-)
-from .target_notification_payload import (
-    TargetNotificationEvent,
-)
+from .deliverypipeline_notification_payload import DeliveryPipelineNotificationEvent
+from .release_notification_payload import ReleaseNotificationEvent
+from .release_render_payload import ReleaseRenderEvent
+from .rollout_notification_payload import RolloutNotificationEvent
+from .target_notification_payload import TargetNotificationEvent
 
 __all__ = (
     "AnthosCluster",
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py
index 44c88cd098a6..05db0df0b328 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/cloud_deploy.py
@@ -13,12 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import proto  # type: ignore
-
 from google.protobuf import field_mask_pb2  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
 from google.type import date_pb2  # type: ignore
-
+import proto  # type: ignore
 
 __protobuf__ = proto.module(
     package="google.cloud.deploy.v1",
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deliverypipeline_notification_payload.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deliverypipeline_notification_payload.py
index 4996d42a25b1..3a67e8db785b 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deliverypipeline_notification_payload.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/deliverypipeline_notification_payload.py
@@ -17,7 +17,6 @@
 
 from google.cloud.deploy_v1.types import log_enums
 
-
 __protobuf__ = proto.module(
     package="google.cloud.deploy.v1",
     manifest={
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py
index d00244afa920..ba8fbf94000e 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/log_enums.py
@@ -15,7 +15,6 @@
 #
 import proto  # type: ignore
 
-
 __protobuf__ = proto.module(
     package="google.cloud.deploy.v1",
     manifest={
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/release_notification_payload.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/release_notification_payload.py
index 005020572983..442e2ab29553 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/release_notification_payload.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/release_notification_payload.py
@@ -17,7 +17,6 @@
 
 from google.cloud.deploy_v1.types import log_enums
 
-
 __protobuf__ = proto.module(
     package="google.cloud.deploy.v1",
     manifest={
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/release_render_payload.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/release_render_payload.py
index aaeab56f0c08..c835e3ccdb39 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/release_render_payload.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/release_render_payload.py
@@ -15,7 +15,6 @@
 #
 import proto  # type: ignore
 
-
 __protobuf__ = proto.module(
     package="google.cloud.deploy.v1",
     manifest={
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_notification_payload.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_notification_payload.py
index 864b1d67d8ac..93e8dd516c0c 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_notification_payload.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/rollout_notification_payload.py
@@ -17,7 +17,6 @@
 
 from google.cloud.deploy_v1.types import log_enums
 
-
 __protobuf__ = proto.module(
     package="google.cloud.deploy.v1",
     manifest={
diff --git a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/target_notification_payload.py b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/target_notification_payload.py
index 4c707c1d447a..1d29961baaae 100644
--- a/packages/google-cloud-deploy/google/cloud/deploy_v1/types/target_notification_payload.py
+++ b/packages/google-cloud-deploy/google/cloud/deploy_v1/types/target_notification_payload.py
@@ -17,7 +17,6 @@
 
 from google.cloud.deploy_v1.types import log_enums
 
-
 __protobuf__ = proto.module(
     package="google.cloud.deploy.v1",
     manifest={
diff --git a/packages/google-cloud-deploy/noxfile.py b/packages/google-cloud-deploy/noxfile.py
index 6ee5e8ab96d9..7c1742d2cc93 100644
--- a/packages/google-cloud-deploy/noxfile.py
+++ b/packages/google-cloud-deploy/noxfile.py
@@ -17,6 +17,7 @@
 # Generated by synthtool. DO NOT EDIT!
 
 from __future__ import absolute_import
+
 import os
 import pathlib
 import shutil
@@ -25,7 +26,8 @@
 import nox
 
 BLACK_VERSION = "black==22.3.0"
-BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
+ISORT_VERSION = "isort==5.10.1"
+LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
 
 DEFAULT_PYTHON_VERSION = "3.8"
 
@@ -83,7 +85,7 @@ def lint(session):
     session.run(
         "black",
         "--check",
-        *BLACK_PATHS,
+        *LINT_PATHS,
     )
     session.run("flake8", "google", "tests")
 
@@ -94,7 +96,27 @@ def blacken(session):
     session.install(BLACK_VERSION)
     session.run(
         "black",
-        *BLACK_PATHS,
+        *LINT_PATHS,
+    )
+
+
+@nox.session(python=DEFAULT_PYTHON_VERSION)
+def format(session):
+    """
+    Run isort to sort imports. Then run black
+    to format code to uniform standard.
+    """
+    session.install(BLACK_VERSION, ISORT_VERSION)
+    # 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",
+        *LINT_PATHS,
+    )
+    session.run(
+        "black",
+        *LINT_PATHS,
     )
 
 
diff --git a/packages/google-cloud-deploy/setup.py b/packages/google-cloud-deploy/setup.py
index 1e3bce284d68..d4cedb5dbecb 100644
--- a/packages/google-cloud-deploy/setup.py
+++ b/packages/google-cloud-deploy/setup.py
@@ -19,7 +19,6 @@
 
 import setuptools
 
-
 name = "google-cloud-deploy"
 description = "Google Cloud Deploy API client library"
 version = "1.1.1"
diff --git a/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py b/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py
index 88deefa2206f..bf5565c78d62 100644
--- a/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py
+++ b/packages/google-cloud-deploy/tests/unit/gapic/deploy_v1/test_cloud_deploy.py
@@ -13,38 +13,41 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import os
-import mock
-
-import grpc
-from grpc.experimental import aio
 import math
-import pytest
-from proto.marshal.rules.dates import DurationRule, TimestampRule
-
+import os
 
+from google.api_core import (
+    future,
+    gapic_v1,
+    grpc_helpers,
+    grpc_helpers_async,
+    operation,
+    operations_v1,
+    path_template,
+)
 from google.api_core import client_options
 from google.api_core import exceptions as core_exceptions
-from google.api_core import future
-from google.api_core import gapic_v1
-from google.api_core import grpc_helpers
-from google.api_core import grpc_helpers_async
-from google.api_core import operation
 from google.api_core import operation_async  # type: ignore
-from google.api_core import operations_v1
-from google.api_core import path_template
+import google.auth
 from google.auth import credentials as ga_credentials
 from google.auth.exceptions import MutualTLSChannelError
-from google.cloud.deploy_v1.services.cloud_deploy import CloudDeployAsyncClient
-from google.cloud.deploy_v1.services.cloud_deploy import CloudDeployClient
-from google.cloud.deploy_v1.services.cloud_deploy import pagers
-from google.cloud.deploy_v1.services.cloud_deploy import transports
-from google.cloud.deploy_v1.types import cloud_deploy
 from google.longrunning import operations_pb2
 from google.oauth2 import service_account
 from google.protobuf import field_mask_pb2  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
-import google.auth
+import grpc
+from grpc.experimental import aio
+import mock
+from proto.marshal.rules.dates import DurationRule, TimestampRule
+import pytest
+
+from google.cloud.deploy_v1.services.cloud_deploy import (
+    CloudDeployAsyncClient,
+    CloudDeployClient,
+    pagers,
+    transports,
+)
+from google.cloud.deploy_v1.types import cloud_deploy
 
 
 def client_cert_source_callback():