From aeadc8c732bb402862d17bc5ccdd95286a722b1f 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 19:52:33 -0400 Subject: [PATCH] chore(python): add nox session to sort python imports (#144) 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 --- .../.github/.OwlBot.lock.yaml | 4 +- packages/google-area120-tables/docs/conf.py | 2 +- .../google/area120/tables/__init__.py | 57 ++++++++++--------- .../area120/tables_v1alpha1/__init__.py | 56 +++++++++--------- .../services/tables_service/__init__.py | 2 +- .../services/tables_service/async_client.py | 12 ++-- .../services/tables_service/client.py | 10 ++-- .../services/tables_service/pagers.py | 4 +- .../tables_service/transports/__init__.py | 1 - .../tables_service/transports/base.py | 6 +- .../tables_service/transports/grpc.py | 11 ++-- .../tables_service/transports/grpc_asyncio.py | 11 ++-- .../area120/tables_v1alpha1/types/__init__.py | 2 +- .../area120/tables_v1alpha1/types/tables.py | 4 +- packages/google-area120-tables/noxfile.py | 28 ++++++++- packages/google-area120-tables/setup.py | 1 + .../tables_v1alpha1/test_tables_service.py | 34 +++++------ 17 files changed, 132 insertions(+), 113 deletions(-) diff --git a/packages/google-area120-tables/.github/.OwlBot.lock.yaml b/packages/google-area120-tables/.github/.OwlBot.lock.yaml index bc893c979e207..7c454abf76f34 100644 --- a/packages/google-area120-tables/.github/.OwlBot.lock.yaml +++ b/packages/google-area120-tables/.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-area120-tables/docs/conf.py b/packages/google-area120-tables/docs/conf.py index 82efd249429eb..b160163987d8b 100644 --- a/packages/google-area120-tables/docs/conf.py +++ b/packages/google-area120-tables/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-area120-tables/google/area120/tables/__init__.py b/packages/google-area120-tables/google/area120/tables/__init__.py index 3a3ac7502804b..709aa2b4793e8 100644 --- a/packages/google-area120-tables/google/area120/tables/__init__.py +++ b/packages/google-area120-tables/google/area120/tables/__init__.py @@ -14,39 +14,40 @@ # limitations under the License. # +from google.area120.tables_v1alpha1.services.tables_service.async_client import ( + TablesServiceAsyncClient, +) from google.area120.tables_v1alpha1.services.tables_service.client import ( TablesServiceClient, ) -from google.area120.tables_v1alpha1.services.tables_service.async_client import ( - TablesServiceAsyncClient, +from google.area120.tables_v1alpha1.types.tables import ( + BatchCreateRowsRequest, + BatchCreateRowsResponse, + BatchDeleteRowsRequest, + BatchUpdateRowsRequest, + BatchUpdateRowsResponse, + ColumnDescription, + CreateRowRequest, + DeleteRowRequest, + GetRowRequest, + GetTableRequest, + GetWorkspaceRequest, + LabeledItem, + ListRowsRequest, + ListRowsResponse, + ListTablesRequest, + ListTablesResponse, + ListWorkspacesRequest, + ListWorkspacesResponse, + LookupDetails, + RelationshipDetails, + Row, + Table, + UpdateRowRequest, + View, + Workspace, ) -from google.area120.tables_v1alpha1.types.tables import BatchCreateRowsRequest -from google.area120.tables_v1alpha1.types.tables import BatchCreateRowsResponse -from google.area120.tables_v1alpha1.types.tables import BatchDeleteRowsRequest -from google.area120.tables_v1alpha1.types.tables import BatchUpdateRowsRequest -from google.area120.tables_v1alpha1.types.tables import BatchUpdateRowsResponse -from google.area120.tables_v1alpha1.types.tables import ColumnDescription -from google.area120.tables_v1alpha1.types.tables import CreateRowRequest -from google.area120.tables_v1alpha1.types.tables import DeleteRowRequest -from google.area120.tables_v1alpha1.types.tables import GetRowRequest -from google.area120.tables_v1alpha1.types.tables import GetTableRequest -from google.area120.tables_v1alpha1.types.tables import GetWorkspaceRequest -from google.area120.tables_v1alpha1.types.tables import LabeledItem -from google.area120.tables_v1alpha1.types.tables import ListRowsRequest -from google.area120.tables_v1alpha1.types.tables import ListRowsResponse -from google.area120.tables_v1alpha1.types.tables import ListTablesRequest -from google.area120.tables_v1alpha1.types.tables import ListTablesResponse -from google.area120.tables_v1alpha1.types.tables import ListWorkspacesRequest -from google.area120.tables_v1alpha1.types.tables import ListWorkspacesResponse -from google.area120.tables_v1alpha1.types.tables import LookupDetails -from google.area120.tables_v1alpha1.types.tables import RelationshipDetails -from google.area120.tables_v1alpha1.types.tables import Row -from google.area120.tables_v1alpha1.types.tables import Table -from google.area120.tables_v1alpha1.types.tables import UpdateRowRequest -from google.area120.tables_v1alpha1.types.tables import Workspace -from google.area120.tables_v1alpha1.types.tables import View - __all__ = ( "TablesServiceClient", "TablesServiceAsyncClient", diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py index 69390c1711899..f6a46ff4efae1 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/__init__.py @@ -14,34 +14,34 @@ # limitations under the License. # -from .services.tables_service import TablesServiceClient -from .services.tables_service import TablesServiceAsyncClient - -from .types.tables import BatchCreateRowsRequest -from .types.tables import BatchCreateRowsResponse -from .types.tables import BatchDeleteRowsRequest -from .types.tables import BatchUpdateRowsRequest -from .types.tables import BatchUpdateRowsResponse -from .types.tables import ColumnDescription -from .types.tables import CreateRowRequest -from .types.tables import DeleteRowRequest -from .types.tables import GetRowRequest -from .types.tables import GetTableRequest -from .types.tables import GetWorkspaceRequest -from .types.tables import LabeledItem -from .types.tables import ListRowsRequest -from .types.tables import ListRowsResponse -from .types.tables import ListTablesRequest -from .types.tables import ListTablesResponse -from .types.tables import ListWorkspacesRequest -from .types.tables import ListWorkspacesResponse -from .types.tables import LookupDetails -from .types.tables import RelationshipDetails -from .types.tables import Row -from .types.tables import Table -from .types.tables import UpdateRowRequest -from .types.tables import Workspace -from .types.tables import View +from .services.tables_service import TablesServiceAsyncClient, TablesServiceClient +from .types.tables import ( + BatchCreateRowsRequest, + BatchCreateRowsResponse, + BatchDeleteRowsRequest, + BatchUpdateRowsRequest, + BatchUpdateRowsResponse, + ColumnDescription, + CreateRowRequest, + DeleteRowRequest, + GetRowRequest, + GetTableRequest, + GetWorkspaceRequest, + LabeledItem, + ListRowsRequest, + ListRowsResponse, + ListTablesRequest, + ListTablesResponse, + ListWorkspacesRequest, + ListWorkspacesResponse, + LookupDetails, + RelationshipDetails, + Row, + Table, + UpdateRowRequest, + View, + Workspace, +) __all__ = ( "TablesServiceAsyncClient", diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/__init__.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/__init__.py index ebd2e17a16961..5e13cc5e7a38c 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/__init__.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/__init__.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from .client import TablesServiceClient from .async_client import TablesServiceAsyncClient +from .client import TablesServiceClient __all__ = ( "TablesServiceClient", diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py index 3035bc8939171..8def632de0437 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/async_client.py @@ -17,26 +17,28 @@ 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] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.Retry, object] # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore + from google.area120.tables_v1alpha1.services.tables_service import pagers from google.area120.tables_v1alpha1.types import tables -from google.protobuf import field_mask_pb2 # type: ignore -from .transports.base import TablesServiceTransport, DEFAULT_CLIENT_INFO -from .transports.grpc_asyncio import TablesServiceGrpcAsyncIOTransport + from .client import TablesServiceClient +from .transports.base import DEFAULT_CLIENT_INFO, TablesServiceTransport +from .transports.grpc_asyncio import TablesServiceGrpcAsyncIOTransport class TablesServiceAsyncClient: diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py index 10421c87456e1..3018b9cc2086e 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/client.py @@ -17,27 +17,29 @@ 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] except AttributeError: # pragma: NO COVER OptionalRetry = Union[retries.Retry, object] # type: ignore +from google.protobuf import field_mask_pb2 # type: ignore + from google.area120.tables_v1alpha1.services.tables_service import pagers from google.area120.tables_v1alpha1.types import tables -from google.protobuf import field_mask_pb2 # type: ignore -from .transports.base import TablesServiceTransport, DEFAULT_CLIENT_INFO + +from .transports.base import DEFAULT_CLIENT_INFO, TablesServiceTransport from .transports.grpc import TablesServiceGrpcTransport from .transports.grpc_asyncio import TablesServiceGrpcAsyncIOTransport diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py index 76917d119e42f..a7e1315397c73 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/pagers.py @@ -18,10 +18,10 @@ AsyncIterator, Awaitable, Callable, + Iterator, + Optional, Sequence, Tuple, - Optional, - Iterator, ) from google.area120.tables_v1alpha1.types import tables diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/__init__.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/__init__.py index d13fa2eb7d8f5..966b2054ed657 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/__init__.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/__init__.py @@ -20,7 +20,6 @@ from .grpc import TablesServiceGrpcTransport from .grpc_asyncio import TablesServiceGrpcAsyncIOTransport - # Compile a registry of transports. _transport_registry = OrderedDict() # type: Dict[str, Type[TablesServiceTransport]] _transport_registry["grpc"] = TablesServiceGrpcTransport diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py index 2ad93286a1ec1..2dd8f9ca879be 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/base.py @@ -15,18 +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 retry as retries +import google.auth # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +from google.protobuf import empty_pb2 # type: ignore +import pkg_resources from google.area120.tables_v1alpha1.types import tables -from google.protobuf import empty_pb2 # type: ignore try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py index 5d1b14a49738b..2738d694a4010 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc.py @@ -13,20 +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 gapic_v1 +from google.api_core import gapic_v1, grpc_helpers 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.protobuf import empty_pb2 # type: ignore import grpc # type: ignore from google.area120.tables_v1alpha1.types import tables -from google.protobuf import empty_pb2 # type: ignore -from .base import TablesServiceTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, TablesServiceTransport class TablesServiceGrpcTransport(TablesServiceTransport): diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py index 031fb6008893a..b2907e8b2807c 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/services/tables_service/transports/grpc_asyncio.py @@ -13,20 +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 gapic_v1, grpc_helpers_async from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore - +from google.protobuf import empty_pb2 # type: ignore import grpc # type: ignore from grpc.experimental import aio # type: ignore from google.area120.tables_v1alpha1.types import tables -from google.protobuf import empty_pb2 # type: ignore -from .base import TablesServiceTransport, DEFAULT_CLIENT_INFO + +from .base import DEFAULT_CLIENT_INFO, TablesServiceTransport from .grpc import TablesServiceGrpcTransport diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/types/__init__.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/types/__init__.py index cfda5f3fe8815..b5b4ad45b73bb 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/types/__init__.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/types/__init__.py @@ -37,8 +37,8 @@ Row, Table, UpdateRowRequest, - Workspace, View, + Workspace, ) __all__ = ( diff --git a/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py b/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py index 33b6c3073c4d2..f6f9023d25f1d 100644 --- a/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.py +++ b/packages/google-area120-tables/google/area120/tables_v1alpha1/types/tables.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 struct_pb2 # type: ignore - +import proto # type: ignore __protobuf__ = proto.module( package="google.area120.tables.v1alpha1", diff --git a/packages/google-area120-tables/noxfile.py b/packages/google-area120-tables/noxfile.py index 6ee5e8ab96d90..7c1742d2cc93c 100644 --- a/packages/google-area120-tables/noxfile.py +++ b/packages/google-area120-tables/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-area120-tables/setup.py b/packages/google-area120-tables/setup.py index 5f64c5bdb9974..aac6955d47215 100644 --- a/packages/google-area120-tables/setup.py +++ b/packages/google-area120-tables/setup.py @@ -17,6 +17,7 @@ import io import os + import setuptools # type: ignore version = "0.6.1" diff --git a/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py b/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py index 13729b1961261..e91880456d143 100644 --- a/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py +++ b/packages/google-area120-tables/tests/unit/gapic/tables_v1alpha1/test_tables_service.py @@ -13,35 +13,31 @@ # See the License for the specific language governing permissions and # limitations under the License. # +import math import os -import mock +from google.api_core import gapic_v1, grpc_helpers, grpc_helpers_async, path_template +from google.api_core import client_options +from google.api_core import exceptions as core_exceptions +import google.auth +from google.auth import credentials as ga_credentials +from google.auth.exceptions import MutualTLSChannelError +from google.oauth2 import service_account +from google.protobuf import field_mask_pb2 # type: ignore +from google.protobuf import struct_pb2 # type: ignore import grpc from grpc.experimental import aio -import math -import pytest +import mock from proto.marshal.rules.dates import DurationRule, TimestampRule +import pytest - -from google.api_core import client_options -from google.api_core import exceptions as core_exceptions -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 path_template from google.area120.tables_v1alpha1.services.tables_service import ( TablesServiceAsyncClient, + TablesServiceClient, + pagers, + transports, ) -from google.area120.tables_v1alpha1.services.tables_service import TablesServiceClient -from google.area120.tables_v1alpha1.services.tables_service import pagers -from google.area120.tables_v1alpha1.services.tables_service import transports from google.area120.tables_v1alpha1.types import tables -from google.auth import credentials as ga_credentials -from google.auth.exceptions import MutualTLSChannelError -from google.oauth2 import service_account -from google.protobuf import field_mask_pb2 # type: ignore -from google.protobuf import struct_pb2 # type: ignore -import google.auth def client_cert_source_callback():