Skip to content

Commit

Permalink
Auto-update dependencies. (#1004)
Browse files Browse the repository at this point in the history
* Auto-update dependencies.

* Fix natural language samples

* Fix pubsub iam samples

* Fix language samples

* Fix bigquery samples
  • Loading branch information
dpebot authored and Jon Wayne Parrott committed Jun 27, 2017
1 parent f21866f commit 57fbe30
Show file tree
Hide file tree
Showing 44 changed files with 62 additions and 109 deletions.
2 changes: 1 addition & 1 deletion appengine/flexible/datastore/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Flask==0.12.2
google-cloud-datastore==1.0.0
google-cloud-datastore==1.1.0
gunicorn==19.7.1
2 changes: 1 addition & 1 deletion appengine/flexible/pubsub/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Flask==0.12.2
google-cloud-pubsub==0.25.0
google-cloud-pubsub==0.26.0
gunicorn==19.7.1
2 changes: 1 addition & 1 deletion appengine/flexible/storage/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Flask==0.12.2
google-cloud-storage==1.1.1
google-cloud-storage==1.2.0
gunicorn==19.7.1
2 changes: 1 addition & 1 deletion auth/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-storage==1.1.1
google-cloud-storage==1.2.0
2 changes: 1 addition & 1 deletion bigquery/api/resources/data.csv
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Gandalf, 2000, 140.0, 1
Gandalf,2000,140.0,1
17 changes: 3 additions & 14 deletions bigquery/cloud-client/async_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,9 @@ def async_query(query):

wait_for_job(query_job)

# Drain the query results by requesting a page at a time.
query_results = query_job.results()
page_token = None

while True:
rows, total_rows, page_token = query_results.fetch_data(
max_results=10,
page_token=page_token)

for row in rows:
print(row)

if not page_token:
break
rows = query_job.results().fetch_data(max_results=10)
for row in rows:
print(row)


if __name__ == '__main__':
Expand Down
17 changes: 4 additions & 13 deletions bigquery/cloud-client/query_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,10 @@ def wait_for_job(job):


def print_results(query_results):
"""Print the query results by requesting a page at a time."""
page_token = None

while True:
rows, total_rows, page_token = query_results.fetch_data(
max_results=10,
page_token=page_token)

for row in rows:
print(row)

if not page_token:
break
"""Print the rows in the query's results."""
rows = query_results.fetch_data(max_results=10)
for row in rows:
print(row)


def query_positional_params(corpus, min_word_count):
Expand Down
4 changes: 2 additions & 2 deletions bigquery/cloud-client/query_params_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ def test_query_named_params(capsys):
corpus='romeoandjuliet',
min_word_count=100)
out, _ = capsys.readouterr()
assert 'love' in out
assert 'the' in out


def test_query_positional_params(capsys):
query_params.query_positional_params(
corpus='romeoandjuliet',
min_word_count=100)
out, _ = capsys.readouterr()
assert 'love' in out
assert 'the' in out


def test_query_struct_params(capsys):
Expand Down
2 changes: 1 addition & 1 deletion bigquery/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
google-cloud-bigquery==0.24.0
google-cloud-bigquery==0.25.0
google-auth-oauthlib==0.1.0
pytz==2017.2
2 changes: 1 addition & 1 deletion bigquery/cloud-client/resources/data.csv
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Gandalf, 2000, 140.0, 1
Gandalf,2000,140.0,1
15 changes: 3 additions & 12 deletions bigquery/cloud-client/simple_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,10 @@ def query_shakespeare():
# [END run_query]

# [START print_results]
# Drain the query results by requesting a page at a time.
page_token = None
rows = query_results.fetch_data(max_results=10)

while True:
rows, total_rows, page_token = query_results.fetch_data(
max_results=10,
page_token=page_token)

for row in rows:
print(row)

if not page_token:
break
for row in rows:
print(row)
# [END print_results]


Expand Down
15 changes: 3 additions & 12 deletions bigquery/cloud-client/sync_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,10 @@ def sync_query(query):

query_results.run()

# Drain the query results by requesting a page at a time.
page_token = None
rows = query_results.fetch_data(max_results=10)

while True:
rows, total_rows, page_token = query_results.fetch_data(
max_results=10,
page_token=page_token)

for row in rows:
print(row)

if not page_token:
break
for row in rows:
print(row)
# [END sync_query]


Expand Down
15 changes: 3 additions & 12 deletions bigquery/cloud-client/user_credentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,11 @@ def run_query(credentials, project, query):

wait_for_job(query_job)

# Drain the query results by requesting a page at a time.
query_results = query_job.results()
page_token = None
rows = query_results.fetch_data(max_results=10)

while True:
rows, total_rows, page_token = query_results.fetch_data(
max_results=10,
page_token=page_token)

for row in rows:
print(row)

if not page_token:
break
for row in rows:
print(row)


def authenticate_and_query(project, query, launch_browser=True):
Expand Down
2 changes: 1 addition & 1 deletion bigquery/dml/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
flake8==3.3.0
google-cloud-bigquery==0.24.0
google-cloud-bigquery==0.25.0
PyMySQL==0.7.11
six==1.10.0
SQLAlchemy==1.1.11
2 changes: 1 addition & 1 deletion bigtable/autoscaler/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-bigtable==0.24.0
google-cloud-monitoring==0.24.0
google-cloud-monitoring==0.25.0
2 changes: 1 addition & 1 deletion bigtable/hello/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-bigtable==0.24.0
google-cloud-core==0.24.1
google-cloud-core==0.25.0
2 changes: 1 addition & 1 deletion bigtable/hello_happybase/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-happybase==0.24.0
google-cloud-core==0.24.1
google-cloud-core==0.25.0
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-datastore==1.0.0
google-cloud-datastore==1.1.0
6 changes: 3 additions & 3 deletions codelabs/flex_and_vision/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Flask==0.12.2
gunicorn==19.7.1
google-cloud-vision==0.24.0
google-cloud-storage==1.1.1
google-cloud-datastore==1.0.0
google-cloud-vision==0.25.0
google-cloud-storage==1.2.0
google-cloud-datastore==1.1.0
2 changes: 1 addition & 1 deletion datastore/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-datastore==1.0.0
google-cloud-datastore==1.1.0
2 changes: 1 addition & 1 deletion dns/api/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-dns==0.24.0
google-cloud-dns==0.25.0
2 changes: 1 addition & 1 deletion endpoints/getting-started/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ gunicorn==19.7.1
six==1.10.0
pyyaml==3.12
requests==2.18.1
google-auth==1.0.0
google-auth==1.0.1
google-auth-oauthlib==0.1.0
2 changes: 1 addition & 1 deletion error_reporting/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-error-reporting==0.24.2
google-cloud-error-reporting==0.25.0
2 changes: 1 addition & 1 deletion iot/api-client/scripts/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-pubsub==0.25.0
google-cloud-pubsub==0.26.0
2 changes: 1 addition & 1 deletion language/cloud-client/v1/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-language==0.24.1
google-cloud-language==0.25.0
4 changes: 2 additions & 2 deletions language/cloud-client/v1/snippets.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def syntax_text(text):
tokens = document.analyze_syntax().tokens

for token in tokens:
print(u'{}: {}'.format(token.part_of_speech, token.text_content))
print(u'{}: {}'.format(token.part_of_speech.tag, token.text_content))


def syntax_file(gcs_uri):
Expand All @@ -135,7 +135,7 @@ def syntax_file(gcs_uri):
tokens = document.analyze_syntax().tokens

for token in tokens:
print(u'{}: {}'.format(token.part_of_speech, token.text_content))
print(u'{}: {}'.format(token.part_of_speech.tag, token.text_content))


if __name__ == '__main__':
Expand Down
2 changes: 1 addition & 1 deletion language/cloud-client/v1beta2/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
gapic-google-cloud-language-v1beta2==0.15.3
google-cloud-language==0.24.1
google-cloud-language==0.25.0
4 changes: 2 additions & 2 deletions language/cloud-client/v1beta2/snippets.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def syntax_text(text):
tokens = document.analyze_syntax().tokens

for token in tokens:
print(u'{}: {}'.format(token.part_of_speech, token.text_content))
print(u'{}: {}'.format(token.part_of_speech.tag, token.text_content))


def syntax_file(gcs_uri):
Expand All @@ -139,7 +139,7 @@ def syntax_file(gcs_uri):
tokens = document.analyze_syntax().tokens

for token in tokens:
print(u'{}: {}'.format(token.part_of_speech, token.text_content))
print(u'{}: {}'.format(token.part_of_speech.tag, token.text_content))


def entity_sentiment_text(text):
Expand Down
2 changes: 1 addition & 1 deletion language/sentiment/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-language==0.24.1
google-cloud-language==0.25.0
2 changes: 1 addition & 1 deletion logging/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-logging==1.0.0
google-cloud-logging==1.1.0
2 changes: 1 addition & 1 deletion monitoring/api/v3/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-monitoring==0.24.0
google-cloud-monitoring==0.25.0
4 changes: 2 additions & 2 deletions pubsub/cloud-client/iam.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def set_topic_policy(topic_name):
policy['roles/pubsub.viewer'] = [policy.all_users()]
# Add a group as publisherss.
publishers = policy.get('roles/pubsub.publisher', [])
publishers.append(policy.group('cloud-logs@google.com'))
publishers.add(policy.group('cloud-logs@google.com'))
policy['roles/pubsub.publisher'] = publishers

# Set the policy
Expand All @@ -90,7 +90,7 @@ def set_subscription_policy(topic_name, subscription_name):
policy['roles/viewer'] = [policy.all_users()]
# # Add a group as editors.
editors = policy.get('roles/editor', [])
editors.append(policy.group('cloud-logs@google.com'))
editors.add(policy.group('cloud-logs@google.com'))
policy['roles/editor'] = editors

# Set the policy
Expand Down
2 changes: 1 addition & 1 deletion pubsub/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-pubsub==0.25.0
google-cloud-pubsub==0.26.0
2 changes: 1 addition & 1 deletion spanner/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-spanner==0.24.2
google-cloud-spanner==0.25.0
2 changes: 1 addition & 1 deletion speech/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-speech==0.25.1
google-cloud-speech==0.26.0
4 changes: 2 additions & 2 deletions storage/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-storage==1.1.1
google-cloud-pubsub==0.25.0
google-cloud-storage==1.2.0
google-cloud-pubsub==0.26.0
2 changes: 1 addition & 1 deletion testing/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ responses==0.5.1
WebTest==2.0.27
webapp2==2.5.2
google-api-python-client==1.6.2
google-cloud-core==0.24.1
google-cloud-core==0.25.0
gcp-devrel-py-tools==0.0.10
2 changes: 1 addition & 1 deletion translate/cloud-client/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-translate==0.24.0
google-cloud-translate==0.25.0
2 changes: 1 addition & 1 deletion vision/cloud-client/crop_hints/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-vision==0.24.0
google-cloud-vision==0.25.0
pillow==4.1.1
2 changes: 1 addition & 1 deletion vision/cloud-client/detect/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-vision==0.24.0
google-cloud-vision==0.25.0
2 changes: 1 addition & 1 deletion vision/cloud-client/document_text/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-vision==0.24.0
google-cloud-vision==0.25.0
pillow==4.1.1
2 changes: 1 addition & 1 deletion vision/cloud-client/face_detection/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
google-cloud-vision==0.24.0
google-cloud-vision==0.25.0
Pillow==4.1.1
2 changes: 1 addition & 1 deletion vision/cloud-client/quickstart/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-vision==0.24.0
google-cloud-vision==0.25.0
2 changes: 1 addition & 1 deletion vision/cloud-client/web/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-vision==0.24.0
google-cloud-vision==0.25.0

0 comments on commit 57fbe30

Please sign in to comment.