Merge branch 'master' into master

Author: gguuss

vision/cloud-client/face_detection/faces.py

@@ -21,7 +21,7 @@
 # [START vision_face_detection_tutorial_imports]
 from google.cloud import vision
 from google.cloud.vision import types
-from PIL import Image, ImageDraw, ImageFont
+from PIL import Image, ImageDraw
 # [END vision_face_detection_tutorial_imports]
 
 
@@ -60,7 +60,6 @@ def highlight_faces(image, faces, output_filename):
     im = Image.open(image)
     draw = ImageDraw.Draw(im)
     # Sepecify the font-family and the font-size
-    font = ImageFont.truetype("arial.ttf", 25)
     for face in faces:
         box = [(vertex.x, vertex.y)
                for vertex in face.bounding_poly.vertices]
@@ -70,7 +69,7 @@ def highlight_faces(image, faces, output_filename):
         draw.text(((face.bounding_poly.vertices)[0].x,
                    (face.bounding_poly.vertices)[0].y - 30),
                   str(format(face.detection_confidence, '.3f')) + '%',
-                  font=font, fill='#FF0000')
+                  fill='#FF0000')
     im.save(output_filename)
 # [END vision_face_detection_tutorial_process_response]
 

vision/cloud-client/product_search/import_product_sets_test.py

@@ -26,7 +26,7 @@
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
 LOCATION = 'us-west1'
 
-GCS_URI = 'gs://python-docs-samples-tests/product_search/product_sets.csv'
+GCS_URI = 'gs://cloud-samples-data/vision/product_search/product_sets.csv'
 PRODUCT_SET_DISPLAY_NAME = 'fake_product_set_display_name_for_testing'
 PRODUCT_SET_ID = 'fake_product_set_id_for_testing'
 PRODUCT_ID_1 = 'fake_product_id_for_testing_1'

vision/cloud-client/product_search/product_search_test.py

@@ -26,7 +26,7 @@
 PRODUCT_ID_2 = 'indexed_product_id_for_testing_2'
 
 FILE_PATH_1 = 'resources/shoes_1.jpg'
-IMAGE_URI_1 = 'gs://python-docs-samples-tests/product_search/shoes_1.jpg'
+IMAGE_URI_1 = 'gs://cloud-samples-data/vision/product_search/shoes_1.jpg'
 FILTER = 'style=womens'
 
 

vision/cloud-client/product_search/reference_image_management_test.py

@@ -29,7 +29,7 @@
 PRODUCT_ID = 'fake_product_id_for_testing'
 
 REFERENCE_IMAGE_ID = 'fake_reference_image_id_for_testing'
-GCS_URI = 'gs://python-docs-samples-tests/product_search/shoes_1.jpg'
+GCS_URI = 'gs://cloud-samples-data/vision/product_search/shoes_1.jpg'
 
 
 @pytest.fixture

vision/cloud-client/product_search/resources/indexed_product_sets.csv

@@ -1,2 +1,2 @@
-"gs://python-docs-samples-tests/product_search/shoes_1.jpg","indexed_product_set_id_for_testing","indexed_product_id_for_testing_1","apparel","style=womens","0.1,0.1,0.9,0.1,0.9,0.9,0.1,0.9"
-"gs://python-docs-samples-tests/product_search/shoes_2.jpg","indexed_product_set_id_for_testing","indexed_product_id_for_testing_2","apparel",,
+"gs://cloud-samples-data/vision/product_search/shoes_1.jpg","indexed_product_set_id_for_testing","indexed_product_id_for_testing_1","apparel","style=womens","0.1,0.1,0.9,0.1,0.9,0.9,0.1,0.9"
+"gs://cloud-samples-data/vision/product_search/shoes_2.jpg","indexed_product_set_id_for_testing","indexed_product_id_for_testing_2","apparel",,

vision/cloud-client/product_search/resources/product_sets.csv

@@ -1,2 +1,2 @@
-"gs://python-docs-samples-tests/product_search/shoes_1.jpg","fake_product_set_id_for_testing","fake_product_id_for_testing_1","apparel","style=womens","0.1,0.1,0.9,0.1,0.9,0.9,0.1,0.9"
-"gs://python-docs-samples-tests/product_search/shoes_2.jpg","fake_product_set_id_for_testing","fake_product_id_for_testing_2","apparel",,
+"gs://cloud-samples-data/vision/product_search/shoes_1.jpg","fake_product_set_id_for_testing","fake_product_id_for_testing_1","apparel","style=womens","0.1,0.1,0.9,0.1,0.9,0.9,0.1,0.9"
+"gs://cloud-samples-data/vision/product_search/shoes_2.jpg","fake_product_set_id_for_testing","fake_product_id_for_testing_2","apparel",,