From 206349401f40122fad9b3d067c49490ee4587e0c Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 20 Apr 2022 23:51:00 +0000 Subject: [PATCH] chore(python): add nox session to sort python imports Source-Link: https://github.com/googleapis/synthtool/commit/1b71c10e20de7ed3f97f692f99a0e3399b67049f Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416 --- .github/.OwlBot.lock.yaml | 4 +- docs/conf.py | 2 +- google/cloud/shell/__init__.py | 41 +++++++++--------- google/cloud/shell_v1/__init__.py | 43 ++++++++++--------- .../services/cloud_shell_service/__init__.py | 2 +- .../cloud_shell_service/async_client.py | 10 +++-- .../services/cloud_shell_service/client.py | 8 ++-- .../transports/__init__.py | 1 - .../cloud_shell_service/transports/base.py | 9 ++-- .../cloud_shell_service/transports/grpc.py | 12 +++--- .../transports/grpc_asyncio.py | 12 +++--- google/cloud/shell_v1/types/cloudshell.py | 4 +- noxfile.py | 28 ++++++++++-- setup.py | 1 - .../shell_v1/test_cloud_shell_service.py | 43 ++++++++++--------- 15 files changed, 121 insertions(+), 99 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index bc893c9..7c454ab 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.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/docs/conf.py b/docs/conf.py index 16854da..0fb429b 100644 --- a/docs/conf.py +++ b/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/google/cloud/shell/__init__.py b/google/cloud/shell/__init__.py index 0e583cc..bf56bf2 100644 --- a/google/cloud/shell/__init__.py +++ b/google/cloud/shell/__init__.py @@ -14,31 +14,32 @@ # limitations under the License. # +from google.cloud.shell_v1.services.cloud_shell_service.async_client import ( + CloudShellServiceAsyncClient, +) from google.cloud.shell_v1.services.cloud_shell_service.client import ( CloudShellServiceClient, ) -from google.cloud.shell_v1.services.cloud_shell_service.async_client import ( - CloudShellServiceAsyncClient, +from google.cloud.shell_v1.types.cloudshell import ( + AddPublicKeyMetadata, + AddPublicKeyRequest, + AddPublicKeyResponse, + AuthorizeEnvironmentMetadata, + AuthorizeEnvironmentRequest, + AuthorizeEnvironmentResponse, + CloudShellErrorDetails, + CreateEnvironmentMetadata, + DeleteEnvironmentMetadata, + Environment, + GetEnvironmentRequest, + RemovePublicKeyMetadata, + RemovePublicKeyRequest, + RemovePublicKeyResponse, + StartEnvironmentMetadata, + StartEnvironmentRequest, + StartEnvironmentResponse, ) -from google.cloud.shell_v1.types.cloudshell import AddPublicKeyMetadata -from google.cloud.shell_v1.types.cloudshell import AddPublicKeyRequest -from google.cloud.shell_v1.types.cloudshell import AddPublicKeyResponse -from google.cloud.shell_v1.types.cloudshell import AuthorizeEnvironmentMetadata -from google.cloud.shell_v1.types.cloudshell import AuthorizeEnvironmentRequest -from google.cloud.shell_v1.types.cloudshell import AuthorizeEnvironmentResponse -from google.cloud.shell_v1.types.cloudshell import CloudShellErrorDetails -from google.cloud.shell_v1.types.cloudshell import CreateEnvironmentMetadata -from google.cloud.shell_v1.types.cloudshell import DeleteEnvironmentMetadata -from google.cloud.shell_v1.types.cloudshell import Environment -from google.cloud.shell_v1.types.cloudshell import GetEnvironmentRequest -from google.cloud.shell_v1.types.cloudshell import RemovePublicKeyMetadata -from google.cloud.shell_v1.types.cloudshell import RemovePublicKeyRequest -from google.cloud.shell_v1.types.cloudshell import RemovePublicKeyResponse -from google.cloud.shell_v1.types.cloudshell import StartEnvironmentMetadata -from google.cloud.shell_v1.types.cloudshell import StartEnvironmentRequest -from google.cloud.shell_v1.types.cloudshell import StartEnvironmentResponse - __all__ = ( "CloudShellServiceClient", "CloudShellServiceAsyncClient", diff --git a/google/cloud/shell_v1/__init__.py b/google/cloud/shell_v1/__init__.py index 90405ad..45ae75b 100644 --- a/google/cloud/shell_v1/__init__.py +++ b/google/cloud/shell_v1/__init__.py @@ -14,26 +14,29 @@ # limitations under the License. # -from .services.cloud_shell_service import CloudShellServiceClient -from .services.cloud_shell_service import CloudShellServiceAsyncClient - -from .types.cloudshell import AddPublicKeyMetadata -from .types.cloudshell import AddPublicKeyRequest -from .types.cloudshell import AddPublicKeyResponse -from .types.cloudshell import AuthorizeEnvironmentMetadata -from .types.cloudshell import AuthorizeEnvironmentRequest -from .types.cloudshell import AuthorizeEnvironmentResponse -from .types.cloudshell import CloudShellErrorDetails -from .types.cloudshell import CreateEnvironmentMetadata -from .types.cloudshell import DeleteEnvironmentMetadata -from .types.cloudshell import Environment -from .types.cloudshell import GetEnvironmentRequest -from .types.cloudshell import RemovePublicKeyMetadata -from .types.cloudshell import RemovePublicKeyRequest -from .types.cloudshell import RemovePublicKeyResponse -from .types.cloudshell import StartEnvironmentMetadata -from .types.cloudshell import StartEnvironmentRequest -from .types.cloudshell import StartEnvironmentResponse +from .services.cloud_shell_service import ( + CloudShellServiceAsyncClient, + CloudShellServiceClient, +) +from .types.cloudshell import ( + AddPublicKeyMetadata, + AddPublicKeyRequest, + AddPublicKeyResponse, + AuthorizeEnvironmentMetadata, + AuthorizeEnvironmentRequest, + AuthorizeEnvironmentResponse, + CloudShellErrorDetails, + CreateEnvironmentMetadata, + DeleteEnvironmentMetadata, + Environment, + GetEnvironmentRequest, + RemovePublicKeyMetadata, + RemovePublicKeyRequest, + RemovePublicKeyResponse, + StartEnvironmentMetadata, + StartEnvironmentRequest, + StartEnvironmentResponse, +) __all__ = ( "CloudShellServiceAsyncClient", diff --git a/google/cloud/shell_v1/services/cloud_shell_service/__init__.py b/google/cloud/shell_v1/services/cloud_shell_service/__init__.py index d08cd0a..86938fd 100644 --- a/google/cloud/shell_v1/services/cloud_shell_service/__init__.py +++ b/google/cloud/shell_v1/services/cloud_shell_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import CloudShellServiceClient from .async_client import CloudShellServiceAsyncClient +from .client import CloudShellServiceClient __all__ = ( "CloudShellServiceClient", diff --git a/google/cloud/shell_v1/services/cloud_shell_service/async_client.py b/google/cloud/shell_v1/services/cloud_shell_service/async_client.py index 8838bbb..c6b278d 100644 --- a/google/cloud/shell_v1/services/cloud_shell_service/async_client.py +++ b/google/cloud/shell_v1/services/cloud_shell_service/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,10 +33,12 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore + from google.cloud.shell_v1.types import cloudshell -from .transports.base import CloudShellServiceTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import CloudShellServiceGrpcAsyncIOTransport + from .client import CloudShellServiceClient +from .transports.base import DEFAULT_CLIENT_INFO, CloudShellServiceTransport +from .transports.grpc_asyncio import CloudShellServiceGrpcAsyncIOTransport class CloudShellServiceAsyncClient: diff --git a/google/cloud/shell_v1/services/cloud_shell_service/client.py b/google/cloud/shell_v1/services/cloud_shell_service/client.py index 4cfa0af..8527f94 100644 --- a/google/cloud/shell_v1/services/cloud_shell_service/client.py +++ b/google/cloud/shell_v1/services/cloud_shell_service/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,8 +36,10 @@ from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore + from google.cloud.shell_v1.types import cloudshell -from .transports.base import CloudShellServiceTransport, DEFAULT_CLIENT_INFO + +from .transports.base import DEFAULT_CLIENT_INFO, CloudShellServiceTransport from .transports.grpc import CloudShellServiceGrpcTransport from .transports.grpc_asyncio import CloudShellServiceGrpcAsyncIOTransport diff --git a/google/cloud/shell_v1/services/cloud_shell_service/transports/__init__.py b/google/cloud/shell_v1/services/cloud_shell_service/transports/__init__.py index 2c11e4b..9a8b985 100644 --- a/google/cloud/shell_v1/services/cloud_shell_service/transports/__init__.py +++ b/google/cloud/shell_v1/services/cloud_shell_service/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import CloudShellServiceGrpcTransport from .grpc_asyncio import CloudShellServiceGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[CloudShellServiceTransport]] _transport_registry["grpc"] = CloudShellServiceGrpcTransport diff --git a/google/cloud/shell_v1/services/cloud_shell_service/transports/base.py b/google/cloud/shell_v1/services/cloud_shell_service/transports/base.py index 7a200a9..87c858b 100644 --- a/google/cloud/shell_v1/services/cloud_shell_service/transports/base.py +++ b/google/cloud/shell_v1/services/cloud_shell_service/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.shell_v1.types import cloudshell -from google.longrunning import operations_pb2 # type: ignore try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/google/cloud/shell_v1/services/cloud_shell_service/transports/grpc.py b/google/cloud/shell_v1/services/cloud_shell_service/transports/grpc.py index f8cc39f..f0a9da3 100644 --- a/google/cloud/shell_v1/services/cloud_shell_service/transports/grpc.py +++ b/google/cloud/shell_v1/services/cloud_shell_service/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.shell_v1.types import cloudshell -from google.longrunning import operations_pb2 # type: ignore -from .base import CloudShellServiceTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, CloudShellServiceTransport class CloudShellServiceGrpcTransport(CloudShellServiceTransport): diff --git a/google/cloud/shell_v1/services/cloud_shell_service/transports/grpc_asyncio.py b/google/cloud/shell_v1/services/cloud_shell_service/transports/grpc_asyncio.py index e7b3279..b9a8d43 100644 --- a/google/cloud/shell_v1/services/cloud_shell_service/transports/grpc_asyncio.py +++ b/google/cloud/shell_v1/services/cloud_shell_service/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.shell_v1.types import cloudshell -from google.longrunning import operations_pb2 # type: ignore -from .base import CloudShellServiceTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, CloudShellServiceTransport from .grpc import CloudShellServiceGrpcTransport diff --git a/google/cloud/shell_v1/types/cloudshell.py b/google/cloud/shell_v1/types/cloudshell.py index 1cbe91f..e2bfa0a 100644 --- a/google/cloud/shell_v1/types/cloudshell.py +++ b/google/cloud/shell_v1/types/cloudshell.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.cloud.shell.v1", diff --git a/noxfile.py b/noxfile.py index 6ee5e8a..7c1742d 100644 --- a/noxfile.py +++ b/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/setup.py b/setup.py index 048ed98..eedfdf3 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,6 @@ import setuptools - name = "google-cloud-shell" description = "Cloud Shell API client library" version = "1.3.2" diff --git a/tests/unit/gapic/shell_v1/test_cloud_shell_service.py b/tests/unit/gapic/shell_v1/test_cloud_shell_service.py index 88f2cb6..e0ad7c2 100644 --- a/tests/unit/gapic/shell_v1/test_cloud_shell_service.py +++ b/tests/unit/gapic/shell_v1/test_cloud_shell_service.py @@ -13,38 +13,39 @@ # 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.longrunning import operations_pb2 +from google.oauth2 import service_account +from google.protobuf import timestamp_pb2 # type: ignore +import grpc +from grpc.experimental import aio +import mock +from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest + from google.cloud.shell_v1.services.cloud_shell_service import ( CloudShellServiceAsyncClient, + CloudShellServiceClient, + transports, ) -from google.cloud.shell_v1.services.cloud_shell_service import CloudShellServiceClient -from google.cloud.shell_v1.services.cloud_shell_service import transports from google.cloud.shell_v1.types import cloudshell -from google.longrunning import operations_pb2 -from google.oauth2 import service_account -from google.protobuf import timestamp_pb2 # type: ignore -import google.auth def client_cert_source_callback():