Skip to content

Commit 8d86326

Browse files
chore(python): add nox session to sort python imports (#312)
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 89db439 commit 8d86326

14 files changed

+22
-19
lines changed

document_ai/snippets/batch_parse_form_v1beta2_test.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
import uuid
1717

1818
from google.cloud import storage
19-
2019
import pytest
21-
2220
from samples.snippets import batch_parse_form_v1beta2
2321

24-
2522
BUCKET = "document-ai-{}".format(uuid.uuid4())
2623
OUTPUT_PREFIX = "TEST_OUTPUT_{}".format(uuid.uuid4())
2724
PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]

document_ai/snippets/batch_parse_table_v1beta2_test.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
import uuid
1717

1818
from google.cloud import storage
19-
2019
import pytest
21-
2220
from samples.snippets import batch_parse_table_v1beta2
2321

24-
2522
BUCKET = "document-ai-{}".format(uuid.uuid4())
2623
OUTPUT_PREFIX = "TEST_OUTPUT_{}".format(uuid.uuid4())
2724
PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]

document_ai/snippets/batch_process_documents_sample_test.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818

1919
from google.cloud import storage
2020
from google.cloud.exceptions import NotFound
21-
2221
import pytest
23-
2422
from samples.snippets import batch_process_documents_sample
2523

2624
location = "us"

document_ai/snippets/noxfile.py

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222

2323
import nox
2424

25-
2625
# WARNING - WARNING - WARNING - WARNING - WARNING
2726
# WARNING - WARNING - WARNING - WARNING - WARNING
2827
# DO NOT EDIT THIS FILE EVER!
2928
# WARNING - WARNING - WARNING - WARNING - WARNING
3029
# WARNING - WARNING - WARNING - WARNING - WARNING
3130

3231
BLACK_VERSION = "black==22.3.0"
32+
ISORT_VERSION = "isort==5.10.1"
3333

3434
# Copy `noxfile_config.py` to your directory and modify it instead.
3535

@@ -168,12 +168,33 @@ def lint(session: nox.sessions.Session) -> None:
168168

169169
@nox.session
170170
def blacken(session: nox.sessions.Session) -> None:
171+
"""Run black. Format code to uniform standard."""
171172
session.install(BLACK_VERSION)
172173
python_files = [path for path in os.listdir(".") if path.endswith(".py")]
173174

174175
session.run("black", *python_files)
175176

176177

178+
#
179+
# format = isort + black
180+
#
181+
182+
183+
@nox.session
184+
def format(session: nox.sessions.Session) -> None:
185+
"""
186+
Run isort to sort imports. Then run black
187+
to format code to uniform standard.
188+
"""
189+
session.install(BLACK_VERSION, ISORT_VERSION)
190+
python_files = [path for path in os.listdir(".") if path.endswith(".py")]
191+
192+
# Use the --fss option to sort imports using strict alphabetical order.
193+
# See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections
194+
session.run("isort", "--fss", *python_files)
195+
session.run("black", *python_files)
196+
197+
177198
#
178199
# Sample Tests
179200
#

document_ai/snippets/parse_form_v1beta2_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
from samples.snippets import parse_form_v1beta2
1818

19-
2019
PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
2120
INPUT_URI = "gs://cloud-samples-data/documentai/form.pdf"
2221

document_ai/snippets/parse_table_v1beta2_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
from samples.snippets import parse_table_v1beta2
1818

19-
2019
PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
2120
INPUT_URI = "gs://cloud-samples-data/documentai/invoice.pdf"
2221

document_ai/snippets/parse_with_model_v1beta2_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
from samples.snippets import parse_with_model_v1beta2
1818

19-
2019
PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
2120
INPUT_URI = "gs://cloud-samples-data/documentai/invoice.pdf"
2221
AUTOML_NL_MODEL_ID = "TCN3472481026502981088"

document_ai/snippets/process_document_form_sample_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
from samples.snippets import process_document_form_sample
1919

20-
2120
location = "us"
2221
project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
2322
processor_id = "90484cfdedb024f6"

document_ai/snippets/process_document_quality_sample_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
from samples.snippets import process_document_quality_sample
1919

20-
2120
location = "us"
2221
project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
2322
processor_id = "7fcb597c523721b3"

document_ai/snippets/process_document_sample_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
from samples.snippets import process_document_sample
1919

20-
2120
location = "us"
2221
project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
2322
processor_id = "90484cfdedb024f6"

document_ai/snippets/process_document_specialized_sample_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
from samples.snippets import process_document_specialized_sample
1919

20-
2120
location = "us"
2221
project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
2322
processor_id = "feacd98c28866ede"

document_ai/snippets/process_document_splitter_sample_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
from samples.snippets import process_document_splitter_sample
1919

20-
2120
location = "us"
2221
project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
2322
processor_id = "ed55eeb2b276066f"

document_ai/snippets/quickstart_v1beta2_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
from samples.snippets import quickstart_v1beta2
1818

19-
2019
PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
2120
INPUT_URI = "gs://cloud-samples-data/documentai/invoice.pdf"
2221

document_ai/snippets/set_endpoint_v1beta2_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
from samples.snippets import set_endpoint_v1beta2
1818

19-
2019
PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
2120
INPUT_URI = "gs://cloud-samples-data/documentai/invoice.pdf"
2221

0 commit comments

Comments
 (0)