Skip to content

Commit c3acce2

Browse files
chore(python): add nox session to sort python imports (#292)
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>
1 parent 7f83961 commit c3acce2

File tree

31 files changed

+244
-236
lines changed

31 files changed

+244
-236
lines changed

packages/google-cloud-secret-manager/.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:8a5d3f6a2e43ed8293f34e06a2f56931d1e88a2694c3bb11b15df4eb256ad163
17-
# created: 2022-04-06T10:30:21.687684602Z
16+
digest: sha256:00c9d764fd1cd56265f12a5ef4b99a0c9e87cf261018099141e2ca5158890416
17+
# created: 2022-04-20T23:42:53.970438194Z

packages/google-cloud-secret-manager/docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
# All configuration values have a default; values that are commented out
2525
# serve to show the default.
2626

27-
import sys
2827
import os
2928
import shlex
29+
import sys
3030

3131
# If extensions (or modules to document with autodoc) are in another directory,
3232
# add these directories to sys.path here. If the directory is relative to the

packages/google-cloud-secret-manager/google/cloud/secretmanager/__init__.py

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,40 @@
1414
# limitations under the License.
1515
#
1616

17-
from google.cloud.secretmanager_v1.services.secret_manager_service.client import (
18-
SecretManagerServiceClient,
19-
)
2017
from google.cloud.secretmanager_v1.services.secret_manager_service.async_client import (
2118
SecretManagerServiceAsyncClient,
2219
)
23-
24-
from google.cloud.secretmanager_v1.types.resources import CustomerManagedEncryption
20+
from google.cloud.secretmanager_v1.services.secret_manager_service.client import (
21+
SecretManagerServiceClient,
22+
)
2523
from google.cloud.secretmanager_v1.types.resources import (
24+
CustomerManagedEncryption,
2625
CustomerManagedEncryptionStatus,
26+
Replication,
27+
ReplicationStatus,
28+
Rotation,
29+
Secret,
30+
SecretPayload,
31+
SecretVersion,
32+
Topic,
33+
)
34+
from google.cloud.secretmanager_v1.types.service import (
35+
AccessSecretVersionRequest,
36+
AccessSecretVersionResponse,
37+
AddSecretVersionRequest,
38+
CreateSecretRequest,
39+
DeleteSecretRequest,
40+
DestroySecretVersionRequest,
41+
DisableSecretVersionRequest,
42+
EnableSecretVersionRequest,
43+
GetSecretRequest,
44+
GetSecretVersionRequest,
45+
ListSecretsRequest,
46+
ListSecretsResponse,
47+
ListSecretVersionsRequest,
48+
ListSecretVersionsResponse,
49+
UpdateSecretRequest,
2750
)
28-
from google.cloud.secretmanager_v1.types.resources import Replication
29-
from google.cloud.secretmanager_v1.types.resources import ReplicationStatus
30-
from google.cloud.secretmanager_v1.types.resources import Rotation
31-
from google.cloud.secretmanager_v1.types.resources import Secret
32-
from google.cloud.secretmanager_v1.types.resources import SecretPayload
33-
from google.cloud.secretmanager_v1.types.resources import SecretVersion
34-
from google.cloud.secretmanager_v1.types.resources import Topic
35-
from google.cloud.secretmanager_v1.types.service import AccessSecretVersionRequest
36-
from google.cloud.secretmanager_v1.types.service import AccessSecretVersionResponse
37-
from google.cloud.secretmanager_v1.types.service import AddSecretVersionRequest
38-
from google.cloud.secretmanager_v1.types.service import CreateSecretRequest
39-
from google.cloud.secretmanager_v1.types.service import DeleteSecretRequest
40-
from google.cloud.secretmanager_v1.types.service import DestroySecretVersionRequest
41-
from google.cloud.secretmanager_v1.types.service import DisableSecretVersionRequest
42-
from google.cloud.secretmanager_v1.types.service import EnableSecretVersionRequest
43-
from google.cloud.secretmanager_v1.types.service import GetSecretRequest
44-
from google.cloud.secretmanager_v1.types.service import GetSecretVersionRequest
45-
from google.cloud.secretmanager_v1.types.service import ListSecretsRequest
46-
from google.cloud.secretmanager_v1.types.service import ListSecretsResponse
47-
from google.cloud.secretmanager_v1.types.service import ListSecretVersionsRequest
48-
from google.cloud.secretmanager_v1.types.service import ListSecretVersionsResponse
49-
from google.cloud.secretmanager_v1.types.service import UpdateSecretRequest
5051

5152
__all__ = (
5253
"SecretManagerServiceClient",

packages/google-cloud-secret-manager/google/cloud/secretmanager_v1/__init__.py

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,38 @@
1414
# limitations under the License.
1515
#
1616

17-
from .services.secret_manager_service import SecretManagerServiceClient
18-
from .services.secret_manager_service import SecretManagerServiceAsyncClient
19-
20-
from .types.resources import CustomerManagedEncryption
21-
from .types.resources import CustomerManagedEncryptionStatus
22-
from .types.resources import Replication
23-
from .types.resources import ReplicationStatus
24-
from .types.resources import Rotation
25-
from .types.resources import Secret
26-
from .types.resources import SecretPayload
27-
from .types.resources import SecretVersion
28-
from .types.resources import Topic
29-
from .types.service import AccessSecretVersionRequest
30-
from .types.service import AccessSecretVersionResponse
31-
from .types.service import AddSecretVersionRequest
32-
from .types.service import CreateSecretRequest
33-
from .types.service import DeleteSecretRequest
34-
from .types.service import DestroySecretVersionRequest
35-
from .types.service import DisableSecretVersionRequest
36-
from .types.service import EnableSecretVersionRequest
37-
from .types.service import GetSecretRequest
38-
from .types.service import GetSecretVersionRequest
39-
from .types.service import ListSecretsRequest
40-
from .types.service import ListSecretsResponse
41-
from .types.service import ListSecretVersionsRequest
42-
from .types.service import ListSecretVersionsResponse
43-
from .types.service import UpdateSecretRequest
17+
from .services.secret_manager_service import (
18+
SecretManagerServiceAsyncClient,
19+
SecretManagerServiceClient,
20+
)
21+
from .types.resources import (
22+
CustomerManagedEncryption,
23+
CustomerManagedEncryptionStatus,
24+
Replication,
25+
ReplicationStatus,
26+
Rotation,
27+
Secret,
28+
SecretPayload,
29+
SecretVersion,
30+
Topic,
31+
)
32+
from .types.service import (
33+
AccessSecretVersionRequest,
34+
AccessSecretVersionResponse,
35+
AddSecretVersionRequest,
36+
CreateSecretRequest,
37+
DeleteSecretRequest,
38+
DestroySecretVersionRequest,
39+
DisableSecretVersionRequest,
40+
EnableSecretVersionRequest,
41+
GetSecretRequest,
42+
GetSecretVersionRequest,
43+
ListSecretsRequest,
44+
ListSecretsResponse,
45+
ListSecretVersionsRequest,
46+
ListSecretVersionsResponse,
47+
UpdateSecretRequest,
48+
)
4449

4550
__all__ = (
4651
"SecretManagerServiceAsyncClient",

packages/google-cloud-secret-manager/google/cloud/secretmanager_v1/services/secret_manager_service/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
from .client import SecretManagerServiceClient
1716
from .async_client import SecretManagerServiceAsyncClient
17+
from .client import SecretManagerServiceClient
1818

1919
__all__ = (
2020
"SecretManagerServiceClient",

packages/google-cloud-secret-manager/google/cloud/secretmanager_v1/services/secret_manager_service/async_client.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,32 @@
1717
import functools
1818
import re
1919
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
20-
import pkg_resources
2120

22-
from google.api_core.client_options import ClientOptions
2321
from google.api_core import exceptions as core_exceptions
2422
from google.api_core import gapic_v1
2523
from google.api_core import retry as retries
24+
from google.api_core.client_options import ClientOptions
2625
from google.auth import credentials as ga_credentials # type: ignore
2726
from google.oauth2 import service_account # type: ignore
27+
import pkg_resources
2828

2929
try:
3030
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
3131
except AttributeError: # pragma: NO COVER
3232
OptionalRetry = Union[retries.Retry, object] # type: ignore
3333

34-
from google.cloud.secretmanager_v1.services.secret_manager_service import pagers
35-
from google.cloud.secretmanager_v1.types import resources
36-
from google.cloud.secretmanager_v1.types import service
3734
from google.iam.v1 import iam_policy_pb2 # type: ignore
3835
from google.iam.v1 import policy_pb2 # type: ignore
3936
from google.protobuf import duration_pb2 # type: ignore
4037
from google.protobuf import field_mask_pb2 # type: ignore
4138
from google.protobuf import timestamp_pb2 # type: ignore
42-
from .transports.base import SecretManagerServiceTransport, DEFAULT_CLIENT_INFO
43-
from .transports.grpc_asyncio import SecretManagerServiceGrpcAsyncIOTransport
39+
40+
from google.cloud.secretmanager_v1.services.secret_manager_service import pagers
41+
from google.cloud.secretmanager_v1.types import resources, service
42+
4443
from .client import SecretManagerServiceClient
44+
from .transports.base import DEFAULT_CLIENT_INFO, SecretManagerServiceTransport
45+
from .transports.grpc_asyncio import SecretManagerServiceGrpcAsyncIOTransport
4546

4647

4748
class SecretManagerServiceAsyncClient:

packages/google-cloud-secret-manager/google/cloud/secretmanager_v1/services/secret_manager_service/client.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,33 @@
1717
import os
1818
import re
1919
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
20-
import pkg_resources
2120

2221
from google.api_core import client_options as client_options_lib
2322
from google.api_core import exceptions as core_exceptions
2423
from google.api_core import gapic_v1
2524
from google.api_core import retry as retries
2625
from google.auth import credentials as ga_credentials # type: ignore
26+
from google.auth.exceptions import MutualTLSChannelError # type: ignore
2727
from google.auth.transport import mtls # type: ignore
2828
from google.auth.transport.grpc import SslCredentials # type: ignore
29-
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3029
from google.oauth2 import service_account # type: ignore
30+
import pkg_resources
3131

3232
try:
3333
OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
3434
except AttributeError: # pragma: NO COVER
3535
OptionalRetry = Union[retries.Retry, object] # type: ignore
3636

37-
from google.cloud.secretmanager_v1.services.secret_manager_service import pagers
38-
from google.cloud.secretmanager_v1.types import resources
39-
from google.cloud.secretmanager_v1.types import service
4037
from google.iam.v1 import iam_policy_pb2 # type: ignore
4138
from google.iam.v1 import policy_pb2 # type: ignore
4239
from google.protobuf import duration_pb2 # type: ignore
4340
from google.protobuf import field_mask_pb2 # type: ignore
4441
from google.protobuf import timestamp_pb2 # type: ignore
45-
from .transports.base import SecretManagerServiceTransport, DEFAULT_CLIENT_INFO
42+
43+
from google.cloud.secretmanager_v1.services.secret_manager_service import pagers
44+
from google.cloud.secretmanager_v1.types import resources, service
45+
46+
from .transports.base import DEFAULT_CLIENT_INFO, SecretManagerServiceTransport
4647
from .transports.grpc import SecretManagerServiceGrpcTransport
4748
from .transports.grpc_asyncio import SecretManagerServiceGrpcAsyncIOTransport
4849

packages/google-cloud-secret-manager/google/cloud/secretmanager_v1/services/secret_manager_service/pagers.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818
AsyncIterator,
1919
Awaitable,
2020
Callable,
21+
Iterator,
22+
Optional,
2123
Sequence,
2224
Tuple,
23-
Optional,
24-
Iterator,
2525
)
2626

27-
from google.cloud.secretmanager_v1.types import resources
28-
from google.cloud.secretmanager_v1.types import service
27+
from google.cloud.secretmanager_v1.types import resources, service
2928

3029

3130
class ListSecretsPager:

packages/google-cloud-secret-manager/google/cloud/secretmanager_v1/services/secret_manager_service/transports/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from .grpc import SecretManagerServiceGrpcTransport
2121
from .grpc_asyncio import SecretManagerServiceGrpcAsyncIOTransport
2222

23-
2423
# Compile a registry of transports.
2524
_transport_registry = (
2625
OrderedDict()

packages/google-cloud-secret-manager/google/cloud/secretmanager_v1/services/secret_manager_service/transports/base.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import pkg_resources
1918

20-
import google.auth # type: ignore
2119
import google.api_core
2220
from google.api_core import exceptions as core_exceptions
2321
from google.api_core import gapic_v1
2422
from google.api_core import retry as retries
23+
import google.auth # type: ignore
2524
from google.auth import credentials as ga_credentials # type: ignore
26-
from google.oauth2 import service_account # type: ignore
27-
28-
from google.cloud.secretmanager_v1.types import resources
29-
from google.cloud.secretmanager_v1.types import service
3025
from google.iam.v1 import iam_policy_pb2 # type: ignore
3126
from google.iam.v1 import policy_pb2 # type: ignore
27+
from google.oauth2 import service_account # type: ignore
3228
from google.protobuf import empty_pb2 # type: ignore
29+
import pkg_resources
30+
31+
from google.cloud.secretmanager_v1.types import resources, service
3332

3433
try:
3534
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(

0 commit comments

Comments
 (0)