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

.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

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

google/cloud/billing/__init__.py

@@ -14,36 +14,39 @@
 # limitations under the License.
 #
 
-from google.cloud.billing_v1.services.cloud_billing.client import CloudBillingClient
 from google.cloud.billing_v1.services.cloud_billing.async_client import (
     CloudBillingAsyncClient,
 )
-from google.cloud.billing_v1.services.cloud_catalog.client import CloudCatalogClient
+from google.cloud.billing_v1.services.cloud_billing.client import CloudBillingClient
 from google.cloud.billing_v1.services.cloud_catalog.async_client import (
     CloudCatalogAsyncClient,
 )
-
-from google.cloud.billing_v1.types.cloud_billing import BillingAccount
-from google.cloud.billing_v1.types.cloud_billing import CreateBillingAccountRequest
-from google.cloud.billing_v1.types.cloud_billing import GetBillingAccountRequest
-from google.cloud.billing_v1.types.cloud_billing import GetProjectBillingInfoRequest
-from google.cloud.billing_v1.types.cloud_billing import ListBillingAccountsRequest
-from google.cloud.billing_v1.types.cloud_billing import ListBillingAccountsResponse
-from google.cloud.billing_v1.types.cloud_billing import ListProjectBillingInfoRequest
-from google.cloud.billing_v1.types.cloud_billing import ListProjectBillingInfoResponse
-from google.cloud.billing_v1.types.cloud_billing import ProjectBillingInfo
-from google.cloud.billing_v1.types.cloud_billing import UpdateBillingAccountRequest
-from google.cloud.billing_v1.types.cloud_billing import UpdateProjectBillingInfoRequest
-from google.cloud.billing_v1.types.cloud_catalog import AggregationInfo
-from google.cloud.billing_v1.types.cloud_catalog import Category
-from google.cloud.billing_v1.types.cloud_catalog import ListServicesRequest
-from google.cloud.billing_v1.types.cloud_catalog import ListServicesResponse
-from google.cloud.billing_v1.types.cloud_catalog import ListSkusRequest
-from google.cloud.billing_v1.types.cloud_catalog import ListSkusResponse
-from google.cloud.billing_v1.types.cloud_catalog import PricingExpression
-from google.cloud.billing_v1.types.cloud_catalog import PricingInfo
-from google.cloud.billing_v1.types.cloud_catalog import Service
-from google.cloud.billing_v1.types.cloud_catalog import Sku
+from google.cloud.billing_v1.services.cloud_catalog.client import CloudCatalogClient
+from google.cloud.billing_v1.types.cloud_billing import (
+    BillingAccount,
+    CreateBillingAccountRequest,
+    GetBillingAccountRequest,
+    GetProjectBillingInfoRequest,
+    ListBillingAccountsRequest,
+    ListBillingAccountsResponse,
+    ListProjectBillingInfoRequest,
+    ListProjectBillingInfoResponse,
+    ProjectBillingInfo,
+    UpdateBillingAccountRequest,
+    UpdateProjectBillingInfoRequest,
+)
+from google.cloud.billing_v1.types.cloud_catalog import (
+    AggregationInfo,
+    Category,
+    ListServicesRequest,
+    ListServicesResponse,
+    ListSkusRequest,
+    ListSkusResponse,
+    PricingExpression,
+    PricingInfo,
+    Service,
+    Sku,
+)
 
 __all__ = (
     "CloudBillingClient",

google/cloud/billing_v1/__init__.py

@@ -14,32 +14,33 @@
 # limitations under the License.
 #
 
-from .services.cloud_billing import CloudBillingClient
-from .services.cloud_billing import CloudBillingAsyncClient
-from .services.cloud_catalog import CloudCatalogClient
-from .services.cloud_catalog import CloudCatalogAsyncClient
-
-from .types.cloud_billing import BillingAccount
-from .types.cloud_billing import CreateBillingAccountRequest
-from .types.cloud_billing import GetBillingAccountRequest
-from .types.cloud_billing import GetProjectBillingInfoRequest
-from .types.cloud_billing import ListBillingAccountsRequest
-from .types.cloud_billing import ListBillingAccountsResponse
-from .types.cloud_billing import ListProjectBillingInfoRequest
-from .types.cloud_billing import ListProjectBillingInfoResponse
-from .types.cloud_billing import ProjectBillingInfo
-from .types.cloud_billing import UpdateBillingAccountRequest
-from .types.cloud_billing import UpdateProjectBillingInfoRequest
-from .types.cloud_catalog import AggregationInfo
-from .types.cloud_catalog import Category
-from .types.cloud_catalog import ListServicesRequest
-from .types.cloud_catalog import ListServicesResponse
-from .types.cloud_catalog import ListSkusRequest
-from .types.cloud_catalog import ListSkusResponse
-from .types.cloud_catalog import PricingExpression
-from .types.cloud_catalog import PricingInfo
-from .types.cloud_catalog import Service
-from .types.cloud_catalog import Sku
+from .services.cloud_billing import CloudBillingAsyncClient, CloudBillingClient
+from .services.cloud_catalog import CloudCatalogAsyncClient, CloudCatalogClient
+from .types.cloud_billing import (
+    BillingAccount,
+    CreateBillingAccountRequest,
+    GetBillingAccountRequest,
+    GetProjectBillingInfoRequest,
+    ListBillingAccountsRequest,
+    ListBillingAccountsResponse,
+    ListProjectBillingInfoRequest,
+    ListProjectBillingInfoResponse,
+    ProjectBillingInfo,
+    UpdateBillingAccountRequest,
+    UpdateProjectBillingInfoRequest,
+)
+from .types.cloud_catalog import (
+    AggregationInfo,
+    Category,
+    ListServicesRequest,
+    ListServicesResponse,
+    ListSkusRequest,
+    ListSkusResponse,
+    PricingExpression,
+    PricingInfo,
+    Service,
+    Sku,
+)
 
 __all__ = (
     "CloudBillingAsyncClient",

google/cloud/billing_v1/services/cloud_billing/__init__.py

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

google/cloud/billing_v1/services/cloud_billing/async_client.py

@@ -17,27 +17,29 @@
 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.cloud.billing_v1.services.cloud_billing import pagers
-from google.cloud.billing_v1.types import cloud_billing
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from .transports.base import CloudBillingTransport, DEFAULT_CLIENT_INFO
-from .transports.grpc_asyncio import CloudBillingGrpcAsyncIOTransport
+
+from google.cloud.billing_v1.services.cloud_billing import pagers
+from google.cloud.billing_v1.types import cloud_billing
+
 from .client import CloudBillingClient
+from .transports.base import DEFAULT_CLIENT_INFO, CloudBillingTransport
+from .transports.grpc_asyncio import CloudBillingGrpcAsyncIOTransport
 
 
 class CloudBillingAsyncClient:

google/cloud/billing_v1/services/cloud_billing/client.py

@@ -17,28 +17,30 @@
 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.cloud.billing_v1.services.cloud_billing import pagers
-from google.cloud.billing_v1.types import cloud_billing
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from .transports.base import CloudBillingTransport, DEFAULT_CLIENT_INFO
+
+from google.cloud.billing_v1.services.cloud_billing import pagers
+from google.cloud.billing_v1.types import cloud_billing
+
+from .transports.base import DEFAULT_CLIENT_INFO, CloudBillingTransport
 from .transports.grpc import CloudBillingGrpcTransport
 from .transports.grpc_asyncio import CloudBillingGrpcAsyncIOTransport
 

google/cloud/billing_v1/services/cloud_billing/pagers.py

@@ -18,10 +18,10 @@
     AsyncIterator,
     Awaitable,
     Callable,
+    Iterator,
+    Optional,
     Sequence,
     Tuple,
-    Optional,
-    Iterator,
 )
 
 from google.cloud.billing_v1.types import cloud_billing

google/cloud/billing_v1/services/cloud_billing/transports/__init__.py

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

google/cloud/billing_v1/services/cloud_billing/transports/base.py

@@ -15,19 +15,19 @@
 #
 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.iam.v1 import iam_policy_pb2  # type: ignore
+from google.iam.v1 import policy_pb2  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import pkg_resources
 
 from google.cloud.billing_v1.types import cloud_billing
-from google.iam.v1 import iam_policy_pb2  # type: ignore
-from google.iam.v1 import policy_pb2  # type: ignore
 
 try:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(

google/cloud/billing_v1/services/cloud_billing/transports/grpc.py

@@ -13,21 +13,20 @@
 # 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.iam.v1 import iam_policy_pb2  # type: ignore
+from google.iam.v1 import policy_pb2  # type: ignore
 import grpc  # type: ignore
 
 from google.cloud.billing_v1.types import cloud_billing
-from google.iam.v1 import iam_policy_pb2  # type: ignore
-from google.iam.v1 import policy_pb2  # type: ignore
-from .base import CloudBillingTransport, DEFAULT_CLIENT_INFO
+
+from .base import DEFAULT_CLIENT_INFO, CloudBillingTransport
 
 
 class CloudBillingGrpcTransport(CloudBillingTransport):

google/cloud/billing_v1/services/cloud_billing/transports/grpc_asyncio.py

@@ -13,21 +13,20 @@
 # 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.iam.v1 import iam_policy_pb2  # type: ignore
+from google.iam.v1 import policy_pb2  # type: ignore
 import grpc  # type: ignore
 from grpc.experimental import aio  # type: ignore
 
 from google.cloud.billing_v1.types import cloud_billing
-from google.iam.v1 import iam_policy_pb2  # type: ignore
-from google.iam.v1 import policy_pb2  # type: ignore
-from .base import CloudBillingTransport, DEFAULT_CLIENT_INFO
+
+from .base import DEFAULT_CLIENT_INFO, CloudBillingTransport
 from .grpc import CloudBillingGrpcTransport
 
 

google/cloud/billing_v1/services/cloud_catalog/__init__.py

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

google/cloud/billing_v1/services/cloud_catalog/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,9 +33,10 @@
 
 from google.cloud.billing_v1.services.cloud_catalog import pagers
 from google.cloud.billing_v1.types import cloud_catalog
-from .transports.base import CloudCatalogTransport, DEFAULT_CLIENT_INFO
-from .transports.grpc_asyncio import CloudCatalogGrpcAsyncIOTransport
+
 from .client import CloudCatalogClient
+from .transports.base import DEFAULT_CLIENT_INFO, CloudCatalogTransport
+from .transports.grpc_asyncio import CloudCatalogGrpcAsyncIOTransport
 
 
 class CloudCatalogAsyncClient:

google/cloud/billing_v1/services/cloud_catalog/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,7 +36,8 @@
 
 from google.cloud.billing_v1.services.cloud_catalog import pagers
 from google.cloud.billing_v1.types import cloud_catalog
-from .transports.base import CloudCatalogTransport, DEFAULT_CLIENT_INFO
+
+from .transports.base import DEFAULT_CLIENT_INFO, CloudCatalogTransport
 from .transports.grpc import CloudCatalogGrpcTransport
 from .transports.grpc_asyncio import CloudCatalogGrpcAsyncIOTransport