From dc7d0d0aa082d9c9afa31906602f1fcb17ab4ba5 Mon Sep 17 00:00:00 2001 From: Takashi Matsuo Date: Tue, 12 May 2020 22:44:45 +0000 Subject: [PATCH] chore: some lint fixes --- dlp/inspect_content.py | 2 +- dlp/quickstart.py | 2 +- dlp/risk_test.py | 4 +++- document/cloud-client/batch_parse_form_beta.py | 3 ++- document/cloud-client/batch_parse_form_beta_test.py | 7 +++++-- document/cloud-client/batch_parse_table_beta.py | 3 ++- document/cloud-client/batch_parse_table_beta_test.py | 7 +++++-- document/cloud-client/parse_form_beta_test.py | 2 ++ document/cloud-client/parse_table_beta_test.py | 2 ++ document/cloud-client/parse_with_model_beta_test.py | 2 ++ document/cloud-client/quickstart_beta_test.py | 2 ++ document/cloud-client/set_endpoint_beta_test.py | 2 ++ endpoints/bookstore-grpc/bookstore_server.py | 3 ++- healthcare/api-client/datasets/datasets.py | 2 +- healthcare/api-client/dicom/dicom_stores.py | 2 +- healthcare/api-client/dicom/dicom_stores_test.py | 10 ++++++---- healthcare/api-client/dicom/dicomweb.py | 3 ++- healthcare/api-client/dicom/dicomweb_test.py | 9 +++++---- 18 files changed, 46 insertions(+), 21 deletions(-) diff --git a/dlp/inspect_content.py b/dlp/inspect_content.py index 9e50ecbdf79d..6d6baad4827a 100644 --- a/dlp/inspect_content.py +++ b/dlp/inspect_content.py @@ -18,8 +18,8 @@ from __future__ import print_function import argparse -import os import json +import os # [START dlp_inspect_string] diff --git a/dlp/quickstart.py b/dlp/quickstart.py index 1b12a83da1db..ec929b45f541 100644 --- a/dlp/quickstart.py +++ b/dlp/quickstart.py @@ -17,8 +17,8 @@ from __future__ import print_function -import sys import argparse +import sys def quickstart(project_id): diff --git a/dlp/risk_test.py b/dlp/risk_test.py index b8acffc4ce5c..ef2b0357dc66 100644 --- a/dlp/risk_test.py +++ b/dlp/risk_test.py @@ -15,12 +15,13 @@ import os import uuid -import google.cloud.pubsub import google.cloud.bigquery +import google.cloud.pubsub import pytest import risk + UNIQUE_STRING = str(uuid.uuid4()).split("-")[0] GCLOUD_PROJECT = os.environ.get("GCLOUD_PROJECT") TABLE_PROJECT = os.environ.get("GCLOUD_PROJECT") @@ -35,6 +36,7 @@ BIGQUERY_TABLE_ID = "dlp_test_table" + UNIQUE_STRING BIGQUERY_HARMFUL_TABLE_ID = "harmful" + UNIQUE_STRING + # Create new custom topic/subscription @pytest.fixture(scope="module") def topic_id(): diff --git a/document/cloud-client/batch_parse_form_beta.py b/document/cloud-client/batch_parse_form_beta.py index 3f22a0e4eef4..3f134dc82d21 100644 --- a/document/cloud-client/batch_parse_form_beta.py +++ b/document/cloud-client/batch_parse_form_beta.py @@ -14,9 +14,10 @@ # [START documentai_batch_parse_form_beta] +import re + from google.cloud import documentai_v1beta2 as documentai from google.cloud import storage -import re def batch_parse_form( diff --git a/document/cloud-client/batch_parse_form_beta_test.py b/document/cloud-client/batch_parse_form_beta_test.py index 6cedc86bb683..d00a03bc821b 100644 --- a/document/cloud-client/batch_parse_form_beta_test.py +++ b/document/cloud-client/batch_parse_form_beta_test.py @@ -12,11 +12,14 @@ # See the License for the specific ladnguage governing permissions and # limitations under the License. -import batch_parse_form_beta import os -import pytest import uuid + from google.cloud import storage +import pytest + +import batch_parse_form_beta + BUCKET = 'document-ai-{}'.format(uuid.uuid4()) OUTPUT_PREFIX = 'TEST_OUTPUT_{}'.format(uuid.uuid4()) diff --git a/document/cloud-client/batch_parse_table_beta.py b/document/cloud-client/batch_parse_table_beta.py index 736fd475bd93..ddaedbf11d0a 100644 --- a/document/cloud-client/batch_parse_table_beta.py +++ b/document/cloud-client/batch_parse_table_beta.py @@ -14,9 +14,10 @@ # [START documentai_batch_parse_table_beta] +import re + from google.cloud import documentai_v1beta2 as documentai from google.cloud import storage -import re def batch_parse_table( diff --git a/document/cloud-client/batch_parse_table_beta_test.py b/document/cloud-client/batch_parse_table_beta_test.py index a5a2916a46d5..02d2c46743fc 100644 --- a/document/cloud-client/batch_parse_table_beta_test.py +++ b/document/cloud-client/batch_parse_table_beta_test.py @@ -12,11 +12,14 @@ # See the License for the specific ladnguage governing permissions and # limitations under the License. -import batch_parse_table_beta import os -import pytest import uuid + from google.cloud import storage +import pytest + +import batch_parse_table_beta + BUCKET = 'document-ai-{}'.format(uuid.uuid4()) OUTPUT_PREFIX = 'TEST_OUTPUT_{}'.format(uuid.uuid4()) diff --git a/document/cloud-client/parse_form_beta_test.py b/document/cloud-client/parse_form_beta_test.py index e027e0bde651..d955aaf71c8c 100644 --- a/document/cloud-client/parse_form_beta_test.py +++ b/document/cloud-client/parse_form_beta_test.py @@ -13,8 +13,10 @@ # limitations under the License. import os + import parse_form_beta + PROJECT_ID = os.environ['GCLOUD_PROJECT'] INPUT_URI = 'gs://cloud-samples-data/documentai/form.pdf' diff --git a/document/cloud-client/parse_table_beta_test.py b/document/cloud-client/parse_table_beta_test.py index 8e74facd384a..8bfbac27dfec 100644 --- a/document/cloud-client/parse_table_beta_test.py +++ b/document/cloud-client/parse_table_beta_test.py @@ -13,8 +13,10 @@ # limitations under the License. import os + import parse_table_beta + PROJECT_ID = os.environ['GCLOUD_PROJECT'] INPUT_URI = 'gs://cloud-samples-data/documentai/invoice.pdf' diff --git a/document/cloud-client/parse_with_model_beta_test.py b/document/cloud-client/parse_with_model_beta_test.py index 2c2f6ba81876..fbce3391212b 100644 --- a/document/cloud-client/parse_with_model_beta_test.py +++ b/document/cloud-client/parse_with_model_beta_test.py @@ -13,8 +13,10 @@ # limitations under the License. import os + import parse_with_model_beta + PROJECT_ID = os.environ['GCLOUD_PROJECT'] INPUT_URI = 'gs://cloud-samples-data/documentai/invoice.pdf' AUTOML_NL_MODEL_ID = 'TCN3472481026502981088' diff --git a/document/cloud-client/quickstart_beta_test.py b/document/cloud-client/quickstart_beta_test.py index 731d746419f0..2e359599c733 100644 --- a/document/cloud-client/quickstart_beta_test.py +++ b/document/cloud-client/quickstart_beta_test.py @@ -13,8 +13,10 @@ # limitations under the License. import os + import quickstart_beta + PROJECT_ID = os.environ['GCLOUD_PROJECT'] INPUT_URI = 'gs://cloud-samples-data/documentai/invoice.pdf' diff --git a/document/cloud-client/set_endpoint_beta_test.py b/document/cloud-client/set_endpoint_beta_test.py index da64715eab5b..8484c855e970 100644 --- a/document/cloud-client/set_endpoint_beta_test.py +++ b/document/cloud-client/set_endpoint_beta_test.py @@ -13,8 +13,10 @@ # limitations under the License. import os + import set_endpoint_beta + PROJECT_ID = os.environ['GCLOUD_PROJECT'] INPUT_URI = 'gs://cloud-samples-data/documentai/invoice.pdf' diff --git a/endpoints/bookstore-grpc/bookstore_server.py b/endpoints/bookstore-grpc/bookstore_server.py index 31f9264148a9..52fc8735c9b6 100644 --- a/endpoints/bookstore-grpc/bookstore_server.py +++ b/endpoints/bookstore-grpc/bookstore_server.py @@ -16,8 +16,8 @@ import argparse from concurrent import futures -import time import os +import time from google.protobuf import struct_pb2 import grpc @@ -27,6 +27,7 @@ import bookstore_pb2_grpc import status + _ONE_DAY_IN_SECONDS = 60 * 60 * 24 diff --git a/healthcare/api-client/datasets/datasets.py b/healthcare/api-client/datasets/datasets.py index 3fb11aa89a44..af90c7f905ba 100644 --- a/healthcare/api-client/datasets/datasets.py +++ b/healthcare/api-client/datasets/datasets.py @@ -15,9 +15,9 @@ import argparse import os +from google.oauth2 import service_account from googleapiclient import discovery from googleapiclient.errors import HttpError -from google.oauth2 import service_account # [START healthcare_get_client] diff --git a/healthcare/api-client/dicom/dicom_stores.py b/healthcare/api-client/dicom/dicom_stores.py index d13ded5e5ce5..074967312410 100644 --- a/healthcare/api-client/dicom/dicom_stores.py +++ b/healthcare/api-client/dicom/dicom_stores.py @@ -15,9 +15,9 @@ import argparse import os +from google.oauth2 import service_account from googleapiclient import discovery from googleapiclient.errors import HttpError -from google.oauth2 import service_account # [START healthcare_get_client] diff --git a/healthcare/api-client/dicom/dicom_stores_test.py b/healthcare/api-client/dicom/dicom_stores_test.py index 856a2986692c..c9b4465f7608 100644 --- a/healthcare/api-client/dicom/dicom_stores_test.py +++ b/healthcare/api-client/dicom/dicom_stores_test.py @@ -13,14 +13,16 @@ # limitations under the License. import os -import pytest import sys import time +import pytest + # Add datasets for bootstrapping datasets for testing -sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'datasets')) # noqa -import datasets -import dicom_stores +sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'datasets')) # noqa +import datasets # noqa +import dicom_stores # noqa + cloud_region = 'us-central1' project_id = os.environ['GOOGLE_CLOUD_PROJECT'] diff --git a/healthcare/api-client/dicom/dicomweb.py b/healthcare/api-client/dicom/dicomweb.py index fe18f9b8b40a..002525bdd1a8 100644 --- a/healthcare/api-client/dicom/dicomweb.py +++ b/healthcare/api-client/dicom/dicomweb.py @@ -17,8 +17,9 @@ import os from google.auth.transport import requests -from googleapiclient.errors import HttpError from google.oauth2 import service_account +from googleapiclient.errors import HttpError + _BASE_URL = 'https://healthcare.googleapis.com/v1beta1' diff --git a/healthcare/api-client/dicom/dicomweb_test.py b/healthcare/api-client/dicom/dicomweb_test.py index bf37f5a68a68..cf6c6943bde4 100644 --- a/healthcare/api-client/dicom/dicomweb_test.py +++ b/healthcare/api-client/dicom/dicomweb_test.py @@ -13,15 +13,16 @@ # limitations under the License. import os -import pytest import sys import time +import pytest + # Add datasets for bootstrapping datasets for testing sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'datasets')) # noqa -import datasets -import dicom_stores -import dicomweb +import datasets # noqa +import dicom_stores # noqa +import dicomweb # noqa cloud_region = 'us-central1' base_url = 'https://healthcare.googleapis.com/v1beta1'