Merge branch 'master' into master

Author: peter-zheng-g

bigquery/bqml/requirements.txt

@@ -1,4 +1,4 @@
 google-cloud-bigquery[pandas]==1.7.0
 flaky==3.4.0
 mock==2.0.0
-pytest==4.0.0
+pytest==4.0.1

cloud-sql/postgres/sqlalchemy/requirements.txt

@@ -1,3 +1,3 @@
 Flask==1.0.2
-SQLAlchemy==1.2.13
+SQLAlchemy==1.2.14
 pg8000==1.12.3

composer/workflows/requirements.txt

@@ -1,4 +1,4 @@
-apache-airflow[gcp_api]==1.10.0
+apache-airflow[gcp_api]==1.10.1
 kubernetes==8.0.0
 scipy==1.1.0
 numpy==1.15.4

testing/requirements.txt

@@ -6,7 +6,7 @@ mock==2.0.0
 mysql-python==1.2.5; python_version < "3.0"
 PyCrypto==2.6.1
 pytest-cov==2.6.0
-pytest==4.0.0
+pytest==4.0.1
 pyyaml==3.13
 responses==0.10.4
 WebTest==2.0.32

video/cloud-client/quickstart/quickstart.py

@@ -33,7 +33,7 @@ def run_quickstart():
         'gs://demomaker/cat.mp4', features=features)
     print('\nProcessing video for label annotations:')
 
-    result = operation.result(timeout=90)
+    result = operation.result(timeout=120)
     print('\nFinished processing.')
 
     # first result is retrieved because a single video was processed

video/cloud-client/shotchange/shotchange.py

@@ -44,7 +44,7 @@ def analyze_shots(path):
     print('\nProcessing video for shot change annotations:')
 
     # [START video_shot_tutorial_check_operation]
-    result = operation.result(timeout=90)
+    result = operation.result(timeout=120)
     print('\nFinished processing.')
     # [END video_shot_tutorial_check_operation]
 

vision/cloud-client/product_search/import_product_sets.py

@@ -24,7 +24,7 @@
 import argparse
 
 # [START vision_product_search_tutorial_import]
-from google.cloud import vision_v1p3beta1 as vision
+from google.cloud import vision
 # [END vision_product_search_tutorial_import]
 
 

vision/cloud-client/product_search/product_in_product_set_management.py

@@ -25,7 +25,7 @@
 
 # [START vision_product_search_add_product_to_product_set]
 # [START vision_product_search_remove_product_from_product_set]
-from google.cloud import vision_v1p3beta1 as vision
+from google.cloud import vision
 
 # [END vision_product_search_add_product_to_product_set]
 # [END vision_product_search_remove_product_from_product_set]

vision/cloud-client/product_search/product_in_product_set_management_test.py

@@ -54,24 +54,24 @@ def product_and_product_set():
 def test_add_product_to_product_set(capsys, product_and_product_set):
     list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID)
     out, _ = capsys.readouterr()
-    assert PRODUCT_ID not in out
+    assert 'Product id: {}'.format(PRODUCT_ID) not in out
 
     add_product_to_product_set(
         PROJECT_ID, LOCATION, PRODUCT_ID, PRODUCT_SET_ID)
     list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID)
     out, _ = capsys.readouterr()
-    assert PRODUCT_ID in out
+    assert 'Product id: {}'.format(PRODUCT_ID) in out
 
 
 def test_remove_product_from_product_set(capsys, product_and_product_set):
     add_product_to_product_set(
         PROJECT_ID, LOCATION, PRODUCT_ID, PRODUCT_SET_ID)
     list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID)
     out, _ = capsys.readouterr()
-    assert PRODUCT_ID in out
+    assert 'Product id: {}'.format(PRODUCT_ID) in out
 
     remove_product_from_product_set(
         PROJECT_ID, LOCATION, PRODUCT_ID, PRODUCT_SET_ID)
     list_products_in_product_set(PROJECT_ID, LOCATION, PRODUCT_SET_ID)
     out, _ = capsys.readouterr()
-    assert PRODUCT_ID not in out
+    assert 'Product id: {}'.format(PRODUCT_ID) not in out

vision/cloud-client/product_search/product_management.py

@@ -28,7 +28,7 @@
 # [START vision_product_search_list_products]
 # [START vision_product_search_get_product]
 # [START vision_product_search_update_product_labels]
-from google.cloud import vision_v1p3beta1 as vision
+from google.cloud import vision
 
 # [END vision_product_search_create_product]
 # [END vision_product_search_delete_product]

vision/cloud-client/product_search/product_search.py

@@ -26,7 +26,7 @@
 
 # [START vision_product_search_get_similar_products]
 # [START vision_product_search_get_similar_products_gcs]
-from google.cloud import vision_v1p3beta1 as vision
+from google.cloud import vision
 
 # [END vision_product_search_get_similar_products]
 # [END vision_product_search_get_similar_products_gcs]

vision/cloud-client/product_search/product_set_management.py

@@ -27,7 +27,7 @@
 # [START vision_product_search_list_product_sets]
 # [START vision_product_search_get_product_set]
 # [START vision_product_search_create_product_set]
-from google.cloud import vision_v1p3beta1 as vision
+from google.cloud import vision
 
 # [END vision_product_search_delete_product_set]
 # [END vision_product_search_list_product_sets]

vision/cloud-client/product_search/reference_image_management.py

@@ -27,7 +27,7 @@
 # [START vision_product_search_delete_reference_image]
 # [START vision_product_search_list_reference_images]
 # [START vision_product_search_get_reference_image]
-from google.cloud import vision_v1p3beta1 as vision
+from google.cloud import vision
 
 # [END vision_product_search_create_reference_image]
 # [END vision_product_search_delete_reference_image]

vision/cloud-client/product_search/requirements.txt

@@ -1 +1 @@
-google-cloud-vision==0.35.0
+google-cloud-vision==0.35.1