chore(python): add nox session to sort python imports (#92)

gcf-owl-bot[bot] · web-flow · commit bdb846ec0ebb · 2022-04-20T20:10:31.000-04:00
Source-Link: googleapis/synthtool@1b71c10 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>
diff --git a/packages/google-cloud-data-fusion/.github/.OwlBot.lock.yaml b/packages/google-cloud-data-fusion/.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-data-fusion/docs/conf.py b/packages/google-cloud-data-fusion/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-data-fusion/google/cloud/data_fusion/__init__.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion/__init__.py
@@ -14,26 +14,27 @@
 # limitations under the License.
 #
 
-from google.cloud.data_fusion_v1.services.data_fusion.client import DataFusionClient
 from google.cloud.data_fusion_v1.services.data_fusion.async_client import (
     DataFusionAsyncClient,
 )
-
-from google.cloud.data_fusion_v1.types.datafusion import Accelerator
-from google.cloud.data_fusion_v1.types.datafusion import CreateInstanceRequest
-from google.cloud.data_fusion_v1.types.datafusion import CryptoKeyConfig
-from google.cloud.data_fusion_v1.types.datafusion import DeleteInstanceRequest
-from google.cloud.data_fusion_v1.types.datafusion import GetInstanceRequest
-from google.cloud.data_fusion_v1.types.datafusion import Instance
-from google.cloud.data_fusion_v1.types.datafusion import ListAvailableVersionsRequest
-from google.cloud.data_fusion_v1.types.datafusion import ListAvailableVersionsResponse
-from google.cloud.data_fusion_v1.types.datafusion import ListInstancesRequest
-from google.cloud.data_fusion_v1.types.datafusion import ListInstancesResponse
-from google.cloud.data_fusion_v1.types.datafusion import NetworkConfig
-from google.cloud.data_fusion_v1.types.datafusion import OperationMetadata
-from google.cloud.data_fusion_v1.types.datafusion import RestartInstanceRequest
-from google.cloud.data_fusion_v1.types.datafusion import UpdateInstanceRequest
-from google.cloud.data_fusion_v1.types.datafusion import Version
+from google.cloud.data_fusion_v1.services.data_fusion.client import DataFusionClient
+from google.cloud.data_fusion_v1.types.datafusion import (
+    Accelerator,
+    CreateInstanceRequest,
+    CryptoKeyConfig,
+    DeleteInstanceRequest,
+    GetInstanceRequest,
+    Instance,
+    ListAvailableVersionsRequest,
+    ListAvailableVersionsResponse,
+    ListInstancesRequest,
+    ListInstancesResponse,
+    NetworkConfig,
+    OperationMetadata,
+    RestartInstanceRequest,
+    UpdateInstanceRequest,
+    Version,
+)
 
 __all__ = (
     "DataFusionClient",
diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/__init__.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/__init__.py
@@ -14,24 +14,24 @@
 # limitations under the License.
 #
 
-from .services.data_fusion import DataFusionClient
-from .services.data_fusion import DataFusionAsyncClient
-
-from .types.datafusion import Accelerator
-from .types.datafusion import CreateInstanceRequest
-from .types.datafusion import CryptoKeyConfig
-from .types.datafusion import DeleteInstanceRequest
-from .types.datafusion import GetInstanceRequest
-from .types.datafusion import Instance
-from .types.datafusion import ListAvailableVersionsRequest
-from .types.datafusion import ListAvailableVersionsResponse
-from .types.datafusion import ListInstancesRequest
-from .types.datafusion import ListInstancesResponse
-from .types.datafusion import NetworkConfig
-from .types.datafusion import OperationMetadata
-from .types.datafusion import RestartInstanceRequest
-from .types.datafusion import UpdateInstanceRequest
-from .types.datafusion import Version
+from .services.data_fusion import DataFusionAsyncClient, DataFusionClient
+from .types.datafusion import (
+    Accelerator,
+    CreateInstanceRequest,
+    CryptoKeyConfig,
+    DeleteInstanceRequest,
+    GetInstanceRequest,
+    Instance,
+    ListAvailableVersionsRequest,
+    ListAvailableVersionsResponse,
+    ListInstancesRequest,
+    ListInstancesResponse,
+    NetworkConfig,
+    OperationMetadata,
+    RestartInstanceRequest,
+    UpdateInstanceRequest,
+    Version,
+)
 
 __all__ = (
     "DataFusionAsyncClient",
diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/__init__.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/__init__.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .client import DataFusionClient
 from .async_client import DataFusionAsyncClient
+from .client import DataFusionClient
 
 __all__ = (
     "DataFusionClient",
diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/async_client.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/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.data_fusion_v1.services.data_fusion import pagers
-from google.cloud.data_fusion_v1.types import datafusion
 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 DataFusionTransport, DEFAULT_CLIENT_INFO
-from .transports.grpc_asyncio import DataFusionGrpcAsyncIOTransport
+
+from google.cloud.data_fusion_v1.services.data_fusion import pagers
+from google.cloud.data_fusion_v1.types import datafusion
+
 from .client import DataFusionClient
+from .transports.base import DEFAULT_CLIENT_INFO, DataFusionTransport
+from .transports.grpc_asyncio import DataFusionGrpcAsyncIOTransport
 
 
 class DataFusionAsyncClient:
diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/client.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/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.data_fusion_v1.services.data_fusion import pagers
-from google.cloud.data_fusion_v1.types import datafusion
 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 DataFusionTransport, DEFAULT_CLIENT_INFO
+
+from google.cloud.data_fusion_v1.services.data_fusion import pagers
+from google.cloud.data_fusion_v1.types import datafusion
+
+from .transports.base import DEFAULT_CLIENT_INFO, DataFusionTransport
 from .transports.grpc import DataFusionGrpcTransport
 from .transports.grpc_asyncio import DataFusionGrpcAsyncIOTransport
 
diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/pagers.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/pagers.py
@@ -18,10 +18,10 @@
     AsyncIterator,
     Awaitable,
     Callable,
+    Iterator,
+    Optional,
     Sequence,
     Tuple,
-    Optional,
-    Iterator,
 )
 
 from google.cloud.data_fusion_v1.types import datafusion
diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/__init__.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/__init__.py
@@ -20,7 +20,6 @@
 from .grpc import DataFusionGrpcTransport
 from .grpc_asyncio import DataFusionGrpcAsyncIOTransport
 
-
 # Compile a registry of transports.
 _transport_registry = OrderedDict()  # type: Dict[str, Type[DataFusionTransport]]
 _transport_registry["grpc"] = DataFusionGrpcTransport
diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/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.data_fusion_v1.types import datafusion
-from google.longrunning import operations_pb2  # type: ignore
 
 try:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/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.data_fusion_v1.types import datafusion
-from google.longrunning import operations_pb2  # type: ignore
-from .base import DataFusionTransport, DEFAULT_CLIENT_INFO
+
+from .base import DEFAULT_CLIENT_INFO, DataFusionTransport
 
 
 class DataFusionGrpcTransport(DataFusionTransport):
diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/services/data_fusion/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.data_fusion_v1.types import datafusion
-from google.longrunning import operations_pb2  # type: ignore
-from .base import DataFusionTransport, DEFAULT_CLIENT_INFO
+
+from .base import DEFAULT_CLIENT_INFO, DataFusionTransport
 from .grpc import DataFusionGrpcTransport
 
 
diff --git a/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/types/datafusion.py b/packages/google-cloud-data-fusion/google/cloud/data_fusion_v1/types/datafusion.py
@@ -13,11 +13,9 @@
 # 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
-
+import proto  # type: ignore
 
 __protobuf__ = proto.module(
     package="google.cloud.datafusion.v1",
diff --git a/packages/google-cloud-data-fusion/noxfile.py b/packages/google-cloud-data-fusion/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-data-fusion/setup.py b/packages/google-cloud-data-fusion/setup.py
@@ -19,7 +19,6 @@
 
 import setuptools
 
-
 name = "google-cloud-data-fusion"
 description = "Cloud Data Fusion API client library"
 version = "1.4.1"
diff --git a/packages/google-cloud-data-fusion/tests/unit/gapic/data_fusion_v1/test_data_fusion.py b/packages/google-cloud-data-fusion/tests/unit/gapic/data_fusion_v1/test_data_fusion.py

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`-from .client import DataFusionClient`
`17`	`16`	`from .async_client import DataFusionAsyncClient`
	`17`	`+from .client import DataFusionClient`
`18`	`18`
`19`	`19`	`__all__ = (`
`20`	`20`	`"DataFusionClient",`