Skip to content

Commit a0daa1d

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore(python): add nox session to sort python imports (#85)
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 7c595d2 commit a0daa1d

File tree

7 files changed

+104
-79
lines changed

7 files changed

+104
-79
lines changed

‎packages/google-cloud-bigquery-logging/.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-bigquery-logging/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-bigquery-logging/google/cloud/bigquery_logging/__init__.py‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,43 @@
1515
#
1616

1717

18-
from google.cloud.bigquery_logging_v1.types.audit_data import AuditData
19-
from google.cloud.bigquery_logging_v1.types.audit_data import BigQueryAcl
20-
from google.cloud.bigquery_logging_v1.types.audit_data import Dataset
21-
from google.cloud.bigquery_logging_v1.types.audit_data import DatasetInfo
22-
from google.cloud.bigquery_logging_v1.types.audit_data import DatasetInsertRequest
23-
from google.cloud.bigquery_logging_v1.types.audit_data import DatasetInsertResponse
24-
from google.cloud.bigquery_logging_v1.types.audit_data import DatasetListRequest
25-
from google.cloud.bigquery_logging_v1.types.audit_data import DatasetName
26-
from google.cloud.bigquery_logging_v1.types.audit_data import DatasetUpdateRequest
27-
from google.cloud.bigquery_logging_v1.types.audit_data import DatasetUpdateResponse
28-
from google.cloud.bigquery_logging_v1.types.audit_data import EncryptionInfo
29-
from google.cloud.bigquery_logging_v1.types.audit_data import Job
30-
from google.cloud.bigquery_logging_v1.types.audit_data import JobCompletedEvent
31-
from google.cloud.bigquery_logging_v1.types.audit_data import JobConfiguration
32-
from google.cloud.bigquery_logging_v1.types.audit_data import JobGetQueryResultsRequest
33-
from google.cloud.bigquery_logging_v1.types.audit_data import JobGetQueryResultsResponse
34-
from google.cloud.bigquery_logging_v1.types.audit_data import JobInsertRequest
35-
from google.cloud.bigquery_logging_v1.types.audit_data import JobInsertResponse
36-
from google.cloud.bigquery_logging_v1.types.audit_data import JobName
37-
from google.cloud.bigquery_logging_v1.types.audit_data import JobQueryDoneResponse
38-
from google.cloud.bigquery_logging_v1.types.audit_data import JobQueryRequest
39-
from google.cloud.bigquery_logging_v1.types.audit_data import JobQueryResponse
40-
from google.cloud.bigquery_logging_v1.types.audit_data import JobStatistics
41-
from google.cloud.bigquery_logging_v1.types.audit_data import JobStatus
42-
from google.cloud.bigquery_logging_v1.types.audit_data import Table
43-
from google.cloud.bigquery_logging_v1.types.audit_data import TableDataListRequest
44-
from google.cloud.bigquery_logging_v1.types.audit_data import TableDataReadEvent
45-
from google.cloud.bigquery_logging_v1.types.audit_data import TableDefinition
46-
from google.cloud.bigquery_logging_v1.types.audit_data import TableInfo
47-
from google.cloud.bigquery_logging_v1.types.audit_data import TableInsertRequest
48-
from google.cloud.bigquery_logging_v1.types.audit_data import TableInsertResponse
49-
from google.cloud.bigquery_logging_v1.types.audit_data import TableName
50-
from google.cloud.bigquery_logging_v1.types.audit_data import TableUpdateRequest
51-
from google.cloud.bigquery_logging_v1.types.audit_data import TableUpdateResponse
52-
from google.cloud.bigquery_logging_v1.types.audit_data import TableViewDefinition
18+
from google.cloud.bigquery_logging_v1.types.audit_data import (
19+
AuditData,
20+
BigQueryAcl,
21+
Dataset,
22+
DatasetInfo,
23+
DatasetInsertRequest,
24+
DatasetInsertResponse,
25+
DatasetListRequest,
26+
DatasetName,
27+
DatasetUpdateRequest,
28+
DatasetUpdateResponse,
29+
EncryptionInfo,
30+
Job,
31+
JobCompletedEvent,
32+
JobConfiguration,
33+
JobGetQueryResultsRequest,
34+
JobGetQueryResultsResponse,
35+
JobInsertRequest,
36+
JobInsertResponse,
37+
JobName,
38+
JobQueryDoneResponse,
39+
JobQueryRequest,
40+
JobQueryResponse,
41+
JobStatistics,
42+
JobStatus,
43+
Table,
44+
TableDataListRequest,
45+
TableDataReadEvent,
46+
TableDefinition,
47+
TableInfo,
48+
TableInsertRequest,
49+
TableInsertResponse,
50+
TableName,
51+
TableUpdateRequest,
52+
TableUpdateResponse,
53+
TableViewDefinition,
54+
)
5355

5456
__all__ = (
5557
"AuditData",

‎packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/__init__.py‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,43 @@
1515
#
1616

1717

18-
from .types.audit_data import AuditData
19-
from .types.audit_data import BigQueryAcl
20-
from .types.audit_data import Dataset
21-
from .types.audit_data import DatasetInfo
22-
from .types.audit_data import DatasetInsertRequest
23-
from .types.audit_data import DatasetInsertResponse
24-
from .types.audit_data import DatasetListRequest
25-
from .types.audit_data import DatasetName
26-
from .types.audit_data import DatasetUpdateRequest
27-
from .types.audit_data import DatasetUpdateResponse
28-
from .types.audit_data import EncryptionInfo
29-
from .types.audit_data import Job
30-
from .types.audit_data import JobCompletedEvent
31-
from .types.audit_data import JobConfiguration
32-
from .types.audit_data import JobGetQueryResultsRequest
33-
from .types.audit_data import JobGetQueryResultsResponse
34-
from .types.audit_data import JobInsertRequest
35-
from .types.audit_data import JobInsertResponse
36-
from .types.audit_data import JobName
37-
from .types.audit_data import JobQueryDoneResponse
38-
from .types.audit_data import JobQueryRequest
39-
from .types.audit_data import JobQueryResponse
40-
from .types.audit_data import JobStatistics
41-
from .types.audit_data import JobStatus
42-
from .types.audit_data import Table
43-
from .types.audit_data import TableDataListRequest
44-
from .types.audit_data import TableDataReadEvent
45-
from .types.audit_data import TableDefinition
46-
from .types.audit_data import TableInfo
47-
from .types.audit_data import TableInsertRequest
48-
from .types.audit_data import TableInsertResponse
49-
from .types.audit_data import TableName
50-
from .types.audit_data import TableUpdateRequest
51-
from .types.audit_data import TableUpdateResponse
52-
from .types.audit_data import TableViewDefinition
18+
from .types.audit_data import (
19+
AuditData,
20+
BigQueryAcl,
21+
Dataset,
22+
DatasetInfo,
23+
DatasetInsertRequest,
24+
DatasetInsertResponse,
25+
DatasetListRequest,
26+
DatasetName,
27+
DatasetUpdateRequest,
28+
DatasetUpdateResponse,
29+
EncryptionInfo,
30+
Job,
31+
JobCompletedEvent,
32+
JobConfiguration,
33+
JobGetQueryResultsRequest,
34+
JobGetQueryResultsResponse,
35+
JobInsertRequest,
36+
JobInsertResponse,
37+
JobName,
38+
JobQueryDoneResponse,
39+
JobQueryRequest,
40+
JobQueryResponse,
41+
JobStatistics,
42+
JobStatus,
43+
Table,
44+
TableDataListRequest,
45+
TableDataReadEvent,
46+
TableDefinition,
47+
TableInfo,
48+
TableInsertRequest,
49+
TableInsertResponse,
50+
TableName,
51+
TableUpdateRequest,
52+
TableUpdateResponse,
53+
TableViewDefinition,
54+
)
5355

5456
__all__ = (
5557
"AuditData",

‎packages/google-cloud-bigquery-logging/google/cloud/bigquery_logging_v1/types/audit_data.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
import proto # type: ignore
17-
1816
from google.iam.v1 import iam_policy_pb2 # type: ignore
1917
from google.iam.v1 import policy_pb2 # type: ignore
2018
from google.protobuf import duration_pb2 # type: ignore
2119
from google.protobuf import timestamp_pb2 # type: ignore
2220
from google.rpc import status_pb2 # type: ignore
23-
21+
import proto # type: ignore
2422

2523
__protobuf__ = proto.module(
2624
package="google.cloud.bigquery.logging.v1",

‎packages/google-cloud-bigquery-logging/noxfile.py‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
# Generated by synthtool. DO NOT EDIT!
1818

1919
from __future__ import absolute_import
20+
2021
import os
2122
import pathlib
2223
import shutil
@@ -25,7 +26,8 @@
2526
import nox
2627

2728
BLACK_VERSION = "black==22.3.0"
28-
BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
29+
ISORT_VERSION = "isort==5.10.1"
30+
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
2931

3032
DEFAULT_PYTHON_VERSION = "3.8"
3133

@@ -83,7 +85,7 @@ def lint(session):
8385
session.run(
8486
"black",
8587
"--check",
86-
*BLACK_PATHS,
88+
*LINT_PATHS,
8789
)
8890
session.run("flake8", "google", "tests")
8991

@@ -94,7 +96,27 @@ def blacken(session):
9496
session.install(BLACK_VERSION)
9597
session.run(
9698
"black",
97-
*BLACK_PATHS,
99+
*LINT_PATHS,
100+
)
101+
102+
103+
@nox.session(python=DEFAULT_PYTHON_VERSION)
104+
def format(session):
105+
"""
106+
Run isort to sort imports. Then run black
107+
to format code to uniform standard.
108+
"""
109+
session.install(BLACK_VERSION, ISORT_VERSION)
110+
# Use the --fss option to sort imports using strict alphabetical order.
111+
# See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections
112+
session.run(
113+
"isort",
114+
"--fss",
115+
*LINT_PATHS,
116+
)
117+
session.run(
118+
"black",
119+
*LINT_PATHS,
98120
)
99121

100122

‎packages/google-cloud-bigquery-logging/setup.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#
1616
import io
1717
import os
18+
1819
import setuptools # type: ignore
1920

2021
version = "1.0.2"

0 commit comments

Comments
 (0)