Merge branch 'master' into master

crwilcox · web-flow · commit afb221a95604 · 2020-05-12T13:02:37.000-07:00
diff --git a/appengine/flexible/pubsub/main.py b/appengine/flexible/pubsub/main.py
@@ -39,6 +39,7 @@
 # and reduce publish latency.
 publisher = pubsub_v1.PublisherClient()
 
+
 # [START gae_flex_pubsub_index]
 @app.route('/', methods=['GET', 'POST'])
 def index():
diff --git a/appengine/flexible/scipy/main.py b/appengine/flexible/scipy/main.py
@@ -16,8 +16,8 @@
 import os
 
 from flask import Flask
-from PIL import Image
 import imageio
+from PIL import Image
 
 app = Flask(__name__)
 
diff --git a/appengine/flexible/tasks/snippets_test.py b/appengine/flexible/tasks/snippets_test.py
@@ -13,9 +13,10 @@
 # limitations under the License.
 
 import os
-import pytest
 import uuid
 
+import pytest
+
 import snippets
 
 TEST_PROJECT_ID = os.getenv('GCLOUD_PROJECT')
diff --git a/appengine/standard_python37/cloud_debugger/main.py b/appengine/standard_python37/cloud_debugger/main.py
@@ -23,7 +23,7 @@
     pass
 
 # Adjust logging level to INFO
-import logging
+import logging  # noqa: I100
 logging.basicConfig(level=logging.INFO)
 
 # If `entrypoint` is not defined in app.yaml, App Engine will look for an app
diff --git a/appengine/standard_python37/pubsub/main.py b/appengine/standard_python37/pubsub/main.py
@@ -14,11 +14,11 @@
 
 # [START app]
 import base64
-from flask import current_app, Flask, render_template, request
 import json
 import logging
 import os
 
+from flask import current_app, Flask, render_template, request
 from google.auth.transport import requests
 from google.cloud import pubsub_v1
 from google.oauth2 import id_token
@@ -39,6 +39,7 @@
 TOKENS = []
 CLAIMS = []
 
+
 # [START index]
 @app.route('/', methods=['GET', 'POST'])
 def index():
diff --git a/appengine/standard_python37/pubsub/main_test.py b/appengine/standard_python37/pubsub/main_test.py
@@ -20,11 +20,11 @@
 import datetime
 import json
 import os
-import pytest
 
 from google.auth import crypt
 from google.auth import jwt
 from google.oauth2 import id_token
+import pytest
 
 import main
 
diff --git a/appengine/standard_python37/spanner/requirements.txt b/appengine/standard_python37/spanner/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-spanner==1.15.1
+google-cloud-spanner==1.16.0
 Flask==1.1.2
diff --git a/asset/cloud-client/quickstart_createfeed_test.py b/asset/cloud-client/quickstart_createfeed_test.py
@@ -18,10 +18,11 @@
 import os
 import time
 
+from google.cloud import pubsub_v1
+from google.cloud import resource_manager
+
 import quickstart_createfeed
 import quickstart_deletefeed
-from google.cloud import resource_manager
-from google.cloud import pubsub_v1
 
 json_data = open(os.environ["GOOGLE_APPLICATION_CREDENTIALS"]).read()
 data = json.loads(json_data)
diff --git a/asset/cloud-client/quickstart_deletefeed_test.py b/asset/cloud-client/quickstart_deletefeed_test.py
@@ -17,10 +17,11 @@
 import os
 import time
 
+from google.cloud import pubsub_v1
+from google.cloud import resource_manager
+
 import quickstart_createfeed
 import quickstart_deletefeed
-from google.cloud import resource_manager
-from google.cloud import pubsub_v1
 
 PROJECT = os.environ['GCLOUD_PROJECT']
 ASSET_NAME = 'assets-{}'.format(int(time.time()))
diff --git a/asset/cloud-client/quickstart_getfeed_test.py b/asset/cloud-client/quickstart_getfeed_test.py
@@ -17,11 +17,12 @@
 import os
 import time
 
+from google.cloud import pubsub_v1
+from google.cloud import resource_manager
+
 import quickstart_createfeed
 import quickstart_deletefeed
 import quickstart_getfeed
-from google.cloud import resource_manager
-from google.cloud import pubsub_v1
 
 PROJECT = os.environ['GCLOUD_PROJECT']
 ASSET_NAME = 'assets-{}'.format(int(time.time()))
diff --git a/asset/cloud-client/quickstart_updatefeed_test.py b/asset/cloud-client/quickstart_updatefeed_test.py
@@ -17,11 +17,12 @@
 import os
 import time
 
+from google.cloud import pubsub_v1
+from google.cloud import resource_manager
+
 import quickstart_createfeed
 import quickstart_deletefeed
 import quickstart_updatefeed
-from google.cloud import resource_manager
-from google.cloud import pubsub_v1
 
 PROJECT = os.environ['GCLOUD_PROJECT']
 ASSET_NAME = 'assets-{}'.format(int(time.time()))
diff --git a/asset/cloud-client/requirements.txt b/asset/cloud-client/requirements.txt
@@ -1,4 +1,4 @@
 google-cloud-storage==1.28.0
-google-cloud-asset==0.9.0
+google-cloud-asset==0.10.0
 google-cloud-resource-manager==0.30.1
 google-cloud-pubsub==1.4.2
diff --git a/auth/http-client/requirements-test.txt b/auth/http-client/requirements-test.txt
diff --git a/auth/http-client/requirements.txt b/auth/http-client/requirements.txt
diff --git a/auth/http-client/snippets.py b/auth/http-client/snippets.py
diff --git a/auth/http-client/snippets_test.py b/auth/http-client/snippets_test.py
diff --git a/automl/beta/set_endpoint_test.py b/automl/beta/set_endpoint_test.py
@@ -13,8 +13,10 @@
 # limitations under the License.
 
 import os
+
 import set_endpoint
 
+
 PROJECT_ID = os.environ['GCLOUD_PROJECT']
 
 
diff --git a/bigquery/bqml/data_scientist_tutorial_test.py b/bigquery/bqml/data_scientist_tutorial_test.py
@@ -12,11 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import uuid
+
 # [START bqml_data_scientist_tutorial_import_and_client]
 from google.cloud import bigquery
 # [END bqml_data_scientist_tutorial_import_and_client]
 import pytest
-import uuid
+
 
 # [START bqml_data_scientist_tutorial_import_and_client]
 client = bigquery.Client()
diff --git a/bigquery/datalab-migration/samples_test.py b/bigquery/datalab-migration/samples_test.py
@@ -16,10 +16,10 @@
 
 import google.auth
 import google.datalab
-import pytest
 import IPython
-from IPython.testing import tools
 from IPython.terminal import interactiveshell
+from IPython.testing import tools
+import pytest
 
 
 # Get default project
diff --git a/bigtable/hello_happybase/main.py b/bigtable/hello_happybase/main.py
@@ -25,6 +25,7 @@
 """
 
 import argparse
+
 # [START bigtable_hw_imports_happybase]
 from google.cloud import bigtable
 from google.cloud import happybase
diff --git a/bigtable/metricscaler/metricscaler_test.py b/bigtable/metricscaler/metricscaler_test.py
@@ -18,10 +18,10 @@
 import time
 import uuid
 
-import pytest
 from google.cloud import bigtable
 from google.cloud.bigtable import enums
 from mock import patch
+import pytest
 
 from metricscaler import get_cpu_load
 from metricscaler import get_storage_utilization
diff --git a/bigtable/quickstart/main_test.py b/bigtable/quickstart/main_test.py
@@ -14,10 +14,12 @@
 
 import os
 import random
+
+from google.cloud import bigtable
 import pytest
 
 from main import main
-from google.cloud import bigtable
+
 
 PROJECT = os.environ['GCLOUD_PROJECT']
 BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
diff --git a/bigtable/quickstart_happybase/main_test.py b/bigtable/quickstart_happybase/main_test.py
@@ -13,11 +13,11 @@
 # limitations under the License.
 
 import os
-
 import random
 
-import pytest
 from google.cloud import bigtable
+import pytest
+
 from main import main
 
 PROJECT = os.environ['GCLOUD_PROJECT']
diff --git a/bigtable/snippets/filters/filter_snippets.py b/bigtable/snippets/filters/filter_snippets.py
@@ -13,6 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# [START bigtable_filters_limit_timestamp_range]
+import datetime
+
+# [END bigtable_filters_limit_timestamp_range]
+
 # [START bigtable_filters_limit_row_sample]
 # [START bigtable_filters_limit_row_regex]
 # [START bigtable_filters_limit_cells_per_col]
@@ -53,11 +58,6 @@
 # [END bigtable_filters_composing_interleave]
 # [END bigtable_filters_composing_condition]
 
-# [START bigtable_filters_limit_timestamp_range]
-import datetime
-
-
-# [END bigtable_filters_limit_timestamp_range]
 
 # [START bigtable_filters_limit_row_sample]
 def filter_limit_row_sample(project_id, instance_id, table_id):
diff --git a/bigtable/snippets/filters/filters_test.py b/bigtable/snippets/filters/filters_test.py
@@ -12,15 +12,16 @@
 # limitations under the License.
 
 
+import datetime
 import os
 import uuid
 
-import datetime
-import pytest
 from google.cloud import bigtable
+import pytest
 
 import filter_snippets
 
+
 PROJECT = os.environ['GCLOUD_PROJECT']
 BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
 TABLE_ID_PREFIX = 'mobile-time-series-{}'
diff --git a/bigtable/snippets/reads/reads_test.py b/bigtable/snippets/reads/reads_test.py
diff --git a/bigtable/snippets/writes/write_simple.py b/bigtable/snippets/writes/write_simple.py
diff --git a/bigtable/snippets/writes/writes_test.py b/bigtable/snippets/writes/writes_test.py
diff --git a/functions/spanner/requirements.txt b/functions/spanner/requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-google-cloud-spanner==1.15.1`
	`1`	`+google-cloud-spanner==1.16.0`
`2`	`2`	`Flask==1.1.2`