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

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>

packages/google-cloud-monitoring-metrics-scopes/.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

packages/google-cloud-monitoring-metrics-scopes/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

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope/__init__.py

@@ -14,33 +14,22 @@
 # limitations under the License.
 #
 
-from google.cloud.monitoring_metrics_scope_v1.services.metrics_scopes.client import (
-    MetricsScopesClient,
-)
 from google.cloud.monitoring_metrics_scope_v1.services.metrics_scopes.async_client import (
     MetricsScopesAsyncClient,
 )
-
-from google.cloud.monitoring_metrics_scope_v1.types.metrics_scope import MetricsScope
+from google.cloud.monitoring_metrics_scope_v1.services.metrics_scopes.client import (
+    MetricsScopesClient,
+)
 from google.cloud.monitoring_metrics_scope_v1.types.metrics_scope import (
+    MetricsScope,
     MonitoredProject,
 )
 from google.cloud.monitoring_metrics_scope_v1.types.metrics_scopes import (
     CreateMonitoredProjectRequest,
-)
-from google.cloud.monitoring_metrics_scope_v1.types.metrics_scopes import (
     DeleteMonitoredProjectRequest,
-)
-from google.cloud.monitoring_metrics_scope_v1.types.metrics_scopes import (
     GetMetricsScopeRequest,
-)
-from google.cloud.monitoring_metrics_scope_v1.types.metrics_scopes import (
     ListMetricsScopesByMonitoredProjectRequest,
-)
-from google.cloud.monitoring_metrics_scope_v1.types.metrics_scopes import (
     ListMetricsScopesByMonitoredProjectResponse,
-)
-from google.cloud.monitoring_metrics_scope_v1.types.metrics_scopes import (
     OperationMetadata,
 )
 

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/__init__.py

@@ -14,17 +14,16 @@
 # limitations under the License.
 #
 
-from .services.metrics_scopes import MetricsScopesClient
-from .services.metrics_scopes import MetricsScopesAsyncClient
-
-from .types.metrics_scope import MetricsScope
-from .types.metrics_scope import MonitoredProject
-from .types.metrics_scopes import CreateMonitoredProjectRequest
-from .types.metrics_scopes import DeleteMonitoredProjectRequest
-from .types.metrics_scopes import GetMetricsScopeRequest
-from .types.metrics_scopes import ListMetricsScopesByMonitoredProjectRequest
-from .types.metrics_scopes import ListMetricsScopesByMonitoredProjectResponse
-from .types.metrics_scopes import OperationMetadata
+from .services.metrics_scopes import MetricsScopesAsyncClient, MetricsScopesClient
+from .types.metrics_scope import MetricsScope, MonitoredProject
+from .types.metrics_scopes import (
+    CreateMonitoredProjectRequest,
+    DeleteMonitoredProjectRequest,
+    GetMetricsScopeRequest,
+    ListMetricsScopesByMonitoredProjectRequest,
+    ListMetricsScopesByMonitoredProjectResponse,
+    OperationMetadata,
+)
 
 __all__ = (
     "MetricsScopesAsyncClient",

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/__init__.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .client import MetricsScopesClient
 from .async_client import MetricsScopesAsyncClient
+from .client import MetricsScopesClient
 
 __all__ = (
     "MetricsScopesClient",

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/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,13 +33,14 @@
 
 from google.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
-from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope
-from google.cloud.monitoring_metrics_scope_v1.types import metrics_scopes
 from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
-from .transports.base import MetricsScopesTransport, DEFAULT_CLIENT_INFO
-from .transports.grpc_asyncio import MetricsScopesGrpcAsyncIOTransport
+
+from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope, metrics_scopes
+
 from .client import MetricsScopesClient
+from .transports.base import DEFAULT_CLIENT_INFO, MetricsScopesTransport
+from .transports.grpc_asyncio import MetricsScopesGrpcAsyncIOTransport
 
 
 class MetricsScopesAsyncClient:

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/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,11 +36,12 @@
 
 from google.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
-from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope
-from google.cloud.monitoring_metrics_scope_v1.types import metrics_scopes
 from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
-from .transports.base import MetricsScopesTransport, DEFAULT_CLIENT_INFO
+
+from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope, metrics_scopes
+
+from .transports.base import DEFAULT_CLIENT_INFO, MetricsScopesTransport
 from .transports.grpc import MetricsScopesGrpcTransport
 from .transports.grpc_asyncio import MetricsScopesGrpcAsyncIOTransport
 

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/__init__.py

@@ -20,7 +20,6 @@
 from .grpc import MetricsScopesGrpcTransport
 from .grpc_asyncio import MetricsScopesGrpcAsyncIOTransport
 
-
 # Compile a registry of transports.
 _transport_registry = OrderedDict()  # type: Dict[str, Type[MetricsScopesTransport]]
 _transport_registry["grpc"] = MetricsScopesGrpcTransport

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/base.py

@@ -15,20 +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.monitoring_metrics_scope_v1.types import metrics_scope
-from google.cloud.monitoring_metrics_scope_v1.types import metrics_scopes
-from google.longrunning import operations_pb2  # type: ignore
+from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope, metrics_scopes
 
 try:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc.py

@@ -13,22 +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.monitoring_metrics_scope_v1.types import metrics_scope
-from google.cloud.monitoring_metrics_scope_v1.types import metrics_scopes
-from google.longrunning import operations_pb2  # type: ignore
-from .base import MetricsScopesTransport, DEFAULT_CLIENT_INFO
+from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope, metrics_scopes
+
+from .base import DEFAULT_CLIENT_INFO, MetricsScopesTransport
 
 
 class MetricsScopesGrpcTransport(MetricsScopesTransport):

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc_asyncio.py

@@ -13,22 +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.monitoring_metrics_scope_v1.types import metrics_scope
-from google.cloud.monitoring_metrics_scope_v1.types import metrics_scopes
-from google.longrunning import operations_pb2  # type: ignore
-from .base import MetricsScopesTransport, DEFAULT_CLIENT_INFO
+from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope, metrics_scopes
+
+from .base import DEFAULT_CLIENT_INFO, MetricsScopesTransport
 from .grpc import MetricsScopesGrpcTransport
 
 

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/__init__.py

@@ -13,10 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .metrics_scope import (
-    MetricsScope,
-    MonitoredProject,
-)
+from .metrics_scope import MetricsScope, MonitoredProject
 from .metrics_scopes import (
     CreateMonitoredProjectRequest,
     DeleteMonitoredProjectRequest,

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/metrics_scope.py

@@ -13,10 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import proto  # type: ignore
-
 from google.protobuf import timestamp_pb2  # type: ignore
-
+import proto  # type: ignore
 
 __protobuf__ = proto.module(
     package="google.monitoring.metricsscope.v1",

packages/google-cloud-monitoring-metrics-scopes/google/cloud/monitoring_metrics_scope_v1/types/metrics_scopes.py

@@ -13,11 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from google.protobuf import timestamp_pb2  # type: ignore
 import proto  # type: ignore
 
 from google.cloud.monitoring_metrics_scope_v1.types import metrics_scope
-from google.protobuf import timestamp_pb2  # type: ignore
-
 
 __protobuf__ = proto.module(
     package="google.monitoring.metricsscope.v1",

packages/google-cloud-monitoring-metrics-scopes/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,
     )
 
 

packages/google-cloud-monitoring-metrics-scopes/setup.py

@@ -15,6 +15,7 @@
 #
 import io
 import os
+
 import setuptools  # type: ignore
 
 version = "1.1.1"