Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 78c213a

Browse filesBrowse files
gguusscrwilcox
gguuss
authored and
crwilcox
committed
Adds updates for samples profiler ... vision (GoogleCloudPlatform#2439)
1 parent 2a35d64 commit 78c213a
Copy full SHA for 78c213a

File tree

Expand file treeCollapse file tree

44 files changed

+89
-87
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

44 files changed

+89
-87
lines changed

‎profiler/appengine/flexible/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
google-cloud-profiler
3+
google-cloud-profiler==1.0.8

‎profiler/appengine/standard_python37/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Flask==1.0.2
2-
google-cloud-profiler
1+
Flask==1.1.1
2+
google-cloud-profiler==1.0.8

‎profiler/quickstart/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-profiler
1+
google-cloud-profiler==1.0.8

‎pubsub/cloud-client/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-pubsub==0.39.1
1+
google-cloud-pubsub==1.0.0

‎pubsub/cloud-client/subscriber_test.py

Copy file name to clipboardExpand all lines: pubsub/cloud-client/subscriber_test.py
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import time
1717

1818
from gcp_devrel.testing import eventually_consistent
19+
from gcp_devrel.testing.flaky import flaky
1920
from google.cloud import pubsub_v1
2021
import google.api_core.exceptions
2122
import mock
@@ -193,6 +194,7 @@ def new_sleep(period):
193194
return mock.patch('time.sleep', new=new_sleep)
194195

195196

197+
@flaky
196198
def test_receive(publisher_client, topic, subscription, capsys):
197199
_publish_messages(publisher_client, topic)
198200

‎run/pubsub/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
2-
pytest==4.3.1
1+
Flask==1.1.1
2+
pytest==5.1.3
33
gunicorn==19.9.0

‎scheduler/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
google-cloud-scheduler==0.1.0
3+
google-cloud-scheduler==1.2.1

‎spanner/cloud-client/bulk_load_csv/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-spanner==1.7.1
2-
futures==3.2.0; python_version < "3"
1+
google-cloud-spanner==1.10.0
2+
futures==3.3.0; python_version < "3"

‎spanner/cloud-client/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
google-cloud-spanner==1.10.0
2-
futures==3.2.0; python_version < "3"
2+
futures==3.3.0; python_version < "3"

‎speech/cloud-client/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-speech==0.36.3
1+
google-cloud-speech==1.2.0

‎speech/microphone/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
google-cloud-speech==0.36.3
1+
google-cloud-speech==1.2.0
22
pyaudio==0.2.11
33
six==1.12.0

‎storage/api/customer_supplied_keys.py

Copy file name to clipboardExpand all lines: storage/api/customer_supplied_keys.py
+10-10Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,18 @@ def upload_object(bucket, filename, encryption_key, key_hash):
8383

8484

8585
def download_object(bucket, obj, out_file, encryption_key, key_hash):
86-
"""Downloads an object protected by a custom encryption key."""
87-
service = create_service()
86+
"""Downloads an object protected by a custom encryption key."""
87+
service = create_service()
8888

89-
request = service.objects().get_media(bucket=bucket, object=obj)
90-
request.headers['x-goog-encryption-algorithm'] = 'AES256'
91-
request.headers['x-goog-encryption-key'] = encryption_key
92-
request.headers['x-goog-encryption-key-sha256'] = key_hash
89+
request = service.objects().get_media(bucket=bucket, object=obj)
90+
request.headers['x-goog-encryption-algorithm'] = 'AES256'
91+
request.headers['x-goog-encryption-key'] = encryption_key
92+
request.headers['x-goog-encryption-key-sha256'] = key_hash
9393

94-
# Unfortunately, http.MediaIoBaseDownload overwrites HTTP headers,
95-
# and so it cannot be used here. Instead, we shall download as a
96-
# single request.
97-
out_file.write(request.execute())
94+
# Unfortunately, http.MediaIoBaseDownload overwrites HTTP headers,
95+
# and so it cannot be used here. Instead, we shall download as a
96+
# single request.
97+
out_file.write(request.execute())
9898

9999

100100
def rotate_key(bucket, obj, current_encryption_key, current_key_hash,

‎storage/api/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
google-api-python-client==1.7.8
2-
google-auth==1.6.2
1+
google-api-python-client==1.7.11
2+
google-auth==1.6.3
33
google-auth-httplib2==0.0.3

‎storage/cloud-client/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-pubsub==0.39.1
1+
google-cloud-pubsub==1.0.0
22
google-cloud-storage==1.19.1

‎storage/s3-sdk/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
boto3==1.9.38
1+
boto3==1.9.236

‎storage/signed_urls/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
google-cloud-storage==1.13.2
2-
google-auth==1.6.2
1+
google-cloud-storage==1.19.1
2+
google-auth==1.6.3
33
six==1.12.0

‎storage/transfer_service/aws_request.py

Copy file name to clipboardExpand all lines: storage/transfer_service/aws_request.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def main(description, project_id, start_date, start_time, source_bucket,
9090
parser.add_argument('source_bucket', help='AWS source bucket name.')
9191
parser.add_argument('access_key_id', help='Your AWS access key id.')
9292
parser.add_argument(
93-
'secret_access_key',
93+
'secret_access_key',
9494
help='Your AWS secret access key.'
9595
)
9696
parser.add_argument('sink_bucket', help='GCS sink bucket name.')

‎storage/transfer_service/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
google-api-python-client==1.7.8
2-
google-auth==1.6.2
1+
google-api-python-client==1.7.11
2+
google-auth==1.6.3
33
google-auth-httplib2==0.0.3

‎tasks/create_http_task.py

Copy file name to clipboardExpand all lines: tasks/create_http_task.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ def create_http_task(project,
3939
# location = 'us-central1'
4040
# url = 'https://example.com/task_handler'
4141
# payload = 'hello'
42-
in_seconds = 10
4342

4443
# Construct the fully qualified queue name.
4544
parent = client.queue_path(project, location, queue)
@@ -57,6 +56,7 @@ def create_http_task(project,
5756

5857
# Add the payload to the request.
5958
task['http_request']['body'] = converted_payload
59+
6060
if in_seconds is not None:
6161
# Convert "seconds from now" into an rfc3339 datetime string.
6262
d = datetime.datetime.utcnow() + datetime.timedelta(seconds=in_seconds)

‎tasks/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-tasks==1.1.0
1+
google-cloud-tasks==1.2.1
22
googleapis-common-protos==1.6.0

‎testing/requirements.txt

Copy file name to clipboard
+13-13Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
beautifulsoup4==4.7.1
2-
coverage==4.5.2
3-
flaky==3.5.3
1+
beautifulsoup4==4.8.0
2+
coverage==4.5.4
3+
flaky==3.6.1
44
funcsigs==1.0.2
5-
mock==2.0.0
5+
mock==3.0.5
66
mysql-python==1.2.5; python_version < "3.0"
77
PyCrypto==2.6.1
8-
pytest-cov==2.6.1
9-
pytest==5.2.0
10-
pyyaml==3.13
11-
responses==0.10.5
12-
WebTest==2.0.32
8+
pytest-cov==2.7.1
9+
pytest==4.6.5
10+
pyyaml==5.1.2
11+
responses==0.10.6
12+
WebTest==2.0.33
1313
webapp2==2.5.2
14-
google-api-python-client==1.7.8
15-
google-cloud-core==0.29.1
14+
google-api-python-client==1.7.11
15+
google-cloud-core==1.0.3
1616
gcp-devrel-py-tools==0.0.15
17-
flask==1.0.2
18-
websocket-client==0.54.0
17+
flask==1.1.1
18+
websocket-client==0.56.0

‎texttospeech/cloud-client/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-texttospeech==0.4.0
1+
google-cloud-texttospeech==0.5.0

‎texttospeech/cloud-client/ssml_addresses_test.py

Copy file name to clipboardExpand all lines: texttospeech/cloud-client/ssml_addresses_test.py
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from ssml_addresses import text_to_ssml
1616
from ssml_addresses import ssml_to_audio
1717

18-
import filecmp
1918
import os
2019

2120

‎trace/requirements.txt

Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
google-cloud-trace==0.21.0
2-
opencensus==0.6.0
3-
opencensus-ext-stackdriver==0.4.0
4-
Flask==1.0.2
1+
google-cloud-trace==0.22.1
2+
opencensus==0.7.3
3+
opencensus-ext-stackdriver==0.7.2
4+
Flask==1.1.1

‎translate/automl/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-automl==0.2.0
1+
google-cloud-automl==0.5.0

‎translate/cloud-client/beta_snippets_test.py

Copy file name to clipboardExpand all lines: translate/cloud-client/beta_snippets_test.py
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ def test_create_glossary(capsys, unique_glossary_id):
9999
beta_snippets.create_glossary(PROJECT_ID, unique_glossary_id)
100100
out, _ = capsys.readouterr()
101101
assert 'Created' in out
102-
assert PROJECT_ID in out
103102
assert unique_glossary_id in out
104103
assert 'gs://cloud-samples-data/translation/glossary.csv' in out
105104

@@ -129,6 +128,5 @@ def test_delete_glossary(capsys, unique_glossary_id):
129128
beta_snippets.create_glossary(PROJECT_ID, unique_glossary_id)
130129
beta_snippets.delete_glossary(PROJECT_ID, unique_glossary_id)
131130
out, _ = capsys.readouterr()
132-
assert PROJECT_ID in out
133131
assert 'us-central1' in out
134132
assert unique_glossary_id in out

‎translate/cloud-client/hybrid_glossaries/requirements.txt

Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
google-cloud-translate==1.4.0
2-
google-cloud-vision==0.35.2
3-
google-cloud-texttospeech==0.4.0
1+
google-cloud-translate==1.6.0
2+
google-cloud-vision==0.39.0
3+
google-cloud-texttospeech==0.5.0

‎translate/cloud-client/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-translate==1.4.0
2-
google-cloud-storage==1.14.0
1+
google-cloud-translate==1.6.0
2+
google-cloud-storage==1.19.1

‎video/cloud-client/analyze/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
google-cloud-videointelligence==1.11.0
2-
google-cloud-storage==1.14.0
2+
google-cloud-storage==1.19.1

‎video/cloud-client/labels/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-videointelligence==1.6.1
1+
google-cloud-videointelligence==1.11.0

‎video/cloud-client/quickstart/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-videointelligence==1.6.1
1+
google-cloud-videointelligence==1.11.0

‎video/cloud-client/shotchange/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-videointelligence==1.6.1
1+
google-cloud-videointelligence==1.11.0

‎vision/automl/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-automl==0.2.0
1+
google-cloud-automl==0.5.0

‎vision/cloud-client/crop_hints/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-vision==0.35.2
2-
pillow==5.4.1
1+
google-cloud-vision==0.39.0
2+
pillow==6.1.0

‎vision/cloud-client/detect/beta_snippets.py

Copy file name to clipboardExpand all lines: vision/cloud-client/detect/beta_snippets.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ def async_batch_annotate_images_uri(input_image_uri, output_uri):
321321
bucket_name = match.group(1)
322322
prefix = match.group(2)
323323

324-
bucket = storage_client.get_bucket(bucket_name=bucket_name)
324+
bucket = storage_client.get_bucket(bucket_name)
325325

326326
# Lists objects with the given prefix.
327327
blob_list = list(bucket.list_blobs(prefix=prefix))

‎vision/cloud-client/detect/detect_test.py

Copy file name to clipboardExpand all lines: vision/cloud-client/detect/detect_test.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,22 +265,22 @@ def test_detect_crop_hints(capsys):
265265
'resources/wakeupcat.jpg')
266266
detect.detect_crop_hints(file_name)
267267
out, _ = capsys.readouterr()
268-
assert 'bounds: (0,0)' in out
268+
assert 'bounds: ' in out
269269

270270

271271
def test_detect_crop_hints_uri(capsys):
272272
file_name = 'gs://{}/vision/label/wakeupcat.jpg'.format(ASSET_BUCKET)
273273
detect.detect_crop_hints_uri(file_name)
274274
out, _ = capsys.readouterr()
275-
assert 'bounds: (0,0)' in out
275+
assert 'bounds: ' in out
276276

277277

278278
def test_detect_crop_hints_http(capsys):
279279
uri = 'https://storage-download.googleapis.com/{}' \
280280
'/vision/label/wakeupcat.jpg'
281281
detect.detect_crop_hints_uri(uri.format(ASSET_BUCKET))
282282
out, _ = capsys.readouterr()
283-
assert 'bounds: (0,0)' in out
283+
assert 'bounds: ' in out
284284

285285

286286
def test_async_detect_document(capsys):

‎vision/cloud-client/detect/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-vision==0.36.0
2-
google-cloud-storage==1.13.2
1+
google-cloud-vision==0.39.0
2+
google-cloud-storage==1.19.1

‎vision/cloud-client/document_text/doctext.py

Copy file name to clipboardExpand all lines: vision/cloud-client/document_text/doctext.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def render_doc_text(filein, fileout):
102102
bounds = get_document_bounds(filein, FeatureType.WORD)
103103
draw_boxes(image, bounds, 'yellow')
104104

105-
if fileout is not 0:
105+
if fileout != 0:
106106
image.save(fileout)
107107
else:
108108
image.show()

‎vision/cloud-client/document_text/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-vision==0.35.2
2-
pillow==5.4.1
1+
google-cloud-vision==0.39.0
2+
pillow==6.1.0

‎vision/cloud-client/face_detection/faces.py

Copy file name to clipboardExpand all lines: vision/cloud-client/face_detection/faces.py
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ def detect_face(face_file, max_results=4):
4242
content = face_file.read()
4343
image = types.Image(content=content)
4444

45-
return client.face_detection(image=image, max_results=max_results).face_annotations
45+
return client.face_detection(
46+
image=image, max_results=max_results).face_annotations
4647
# [END vision_face_detection_tutorial_send_request]
4748

4849

‎vision/cloud-client/face_detection/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-vision==0.35.2
2-
Pillow==5.4.1
1+
google-cloud-vision==0.39.0
2+
Pillow==6.1.0

‎vision/cloud-client/quickstart/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-vision==0.35.2
1+
google-cloud-vision==0.39.0

‎vision/cloud-client/web/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
google-cloud-vision==0.35.2
1+
google-cloud-vision==0.39.0

‎vision/cloud-client/web/web_detect_test.py

Copy file name to clipboardExpand all lines: vision/cloud-client/web/web_detect_test.py
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,21 @@ def test_detect_file(capsys):
2222
web_detect.report(web_detect.annotate(file_name))
2323
out, _ = capsys.readouterr()
2424
print(out)
25-
assert 'description: palace of fine arts' in out.lower()
25+
assert 'description' in out.lower()
26+
assert 'palace' in out.lower()
2627

2728

2829
def test_detect_web_gsuri(capsys):
2930
file_name = ('gs://{}/vision/landmark/pofa.jpg'.format(
3031
ASSET_BUCKET))
3132
web_detect.report(web_detect.annotate(file_name))
3233
out, _ = capsys.readouterr()
33-
assert 'description: palace of fine arts' in out.lower()
34+
assert 'description:' in out.lower()
35+
assert 'palace' in out.lower()
3436

3537

3638
def test_detect_web_http(capsys):
3739
web_detect.report(web_detect.annotate(
3840
'https://cloud.google.com/images/products/vision/extract-text.png'))
3941
out, _ = capsys.readouterr()
40-
assert 'https://cloud.google.com/vision' in out
42+
assert 'web entities' in out.lower()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.