diff --git a/compute/oslogin/service_account_ssh.py b/compute/oslogin/service_account_ssh.py index ce854e63829..73d129c12b8 100644 --- a/compute/oslogin/service_account_ssh.py +++ b/compute/oslogin/service_account_ssh.py @@ -21,13 +21,15 @@ """ # [START imports_and_variables] -import time +import argparse +import logging import subprocess +import time import uuid -import logging -import requests -import argparse + import googleapiclient.discovery +import requests + # Global variables SERVICE_ACCOUNT_METADATA_URL = ( diff --git a/compute/oslogin/service_account_ssh_test.py b/compute/oslogin/service_account_ssh_test.py index 37e369d9773..410985c98fc 100644 --- a/compute/oslogin/service_account_ssh_test.py +++ b/compute/oslogin/service_account_ssh_test.py @@ -17,8 +17,8 @@ import random import time -import googleapiclient.discovery from google.oauth2 import service_account +import googleapiclient.discovery from retrying import retry from service_account_ssh import main diff --git a/dataflow/run_template/main_test.py b/dataflow/run_template/main_test.py index 413f9891755..e6617033ca6 100644 --- a/dataflow/run_template/main_test.py +++ b/dataflow/run_template/main_test.py @@ -17,25 +17,27 @@ # nox -s "py27(sample='./dataflow/run_template')" # nox -s "py36(sample='./dataflow/run_template')" -import flask +from datetime import datetime import json import os -import pytest import time import uuid -from datetime import datetime +import flask from googleapiclient.discovery import build from googleapiclient.errors import HttpError +import pytest from werkzeug.urls import url_encode import main + PROJECT = os.environ['GCLOUD_PROJECT'] BUCKET = os.environ['CLOUD_STORAGE_BUCKET'] dataflow = build('dataflow', 'v1b3') + # Create a fake "app" for generating test request contexts. @pytest.fixture(scope="module") def app(): diff --git a/dataproc/create_cluster_test.py b/dataproc/create_cluster_test.py index 72ffce2bf06..6d815b5bc61 100644 --- a/dataproc/create_cluster_test.py +++ b/dataproc/create_cluster_test.py @@ -14,9 +14,9 @@ import os import uuid -import pytest from google.cloud import dataproc_v1 as dataproc +import pytest import create_cluster diff --git a/dataproc/quickstart/quickstart_test.py b/dataproc/quickstart/quickstart_test.py index a38019d9b18..7788e094634 100644 --- a/dataproc/quickstart/quickstart_test.py +++ b/dataproc/quickstart/quickstart_test.py @@ -14,10 +14,10 @@ import os import uuid -import pytest from google.cloud import dataproc_v1 as dataproc from google.cloud import storage +import pytest import quickstart diff --git a/dataproc/single_job_workflow.py b/dataproc/single_job_workflow.py index b17ea0b9599..b2754b06c1e 100644 --- a/dataproc/single_job_workflow.py +++ b/dataproc/single_job_workflow.py @@ -28,9 +28,10 @@ import os from google.cloud import dataproc_v1 +from google.cloud import storage from google.cloud.dataproc_v1.gapic.transports import ( workflow_template_service_grpc_transport) -from google.cloud import storage + DEFAULT_FILENAME = "pyspark_sort.py" waiting_callback = False diff --git a/dataproc/submit_job_to_cluster.py b/dataproc/submit_job_to_cluster.py index 1c648abc1a7..389cbec87aa 100644 --- a/dataproc/submit_job_to_cluster.py +++ b/dataproc/submit_job_to_cluster.py @@ -33,11 +33,12 @@ import os from google.cloud import dataproc_v1 +from google.cloud import storage from google.cloud.dataproc_v1.gapic.transports import ( cluster_controller_grpc_transport) from google.cloud.dataproc_v1.gapic.transports import ( job_controller_grpc_transport) -from google.cloud import storage + DEFAULT_FILENAME = 'pyspark_sort.py' waiting_callback = False diff --git a/datastore/cloud-ndb/flask_app_test.py b/datastore/cloud-ndb/flask_app_test.py index f48085a54a4..547b59e3da2 100644 --- a/datastore/cloud-ndb/flask_app_test.py +++ b/datastore/cloud-ndb/flask_app_test.py @@ -16,8 +16,8 @@ import backoff -import pytest from google.cloud import ndb +import pytest import flask_app diff --git a/dialogflow/cloud-client/create_knowledge_base_test.py b/dialogflow/cloud-client/create_knowledge_base_test.py index 2bcdf2cb1ce..b605edfda41 100644 --- a/dialogflow/cloud-client/create_knowledge_base_test.py +++ b/dialogflow/cloud-client/create_knowledge_base_test.py @@ -16,9 +16,9 @@ import os import uuid -import pytest import dialogflow_v2beta1 as dialogflow +import pytest import knowledge_base_management