Merge branch 'master' into tswast-bq

tswast · web-flow · commit a8c5f426a7d3 · 2017-04-24T15:14:18.000-07:00
diff --git a/appengine/standard/firebase/firenotes/backend/requirements.txt b/appengine/standard/firebase/firenotes/backend/requirements.txt
@@ -1,6 +1,6 @@
 Flask==0.12.1
-pyjwt==1.4.2
+pyjwt==1.5.0
 flask-cors==3.0.2
-google-auth==0.10.0
+google-auth==1.0.0
 requests==2.13.0
 requests-toolbelt==0.7.1
diff --git a/bigquery/dml/requirements.txt b/bigquery/dml/requirements.txt
@@ -1,5 +1,5 @@
 flake8==3.3.0
-google-cloud-bigquery==0.22.1
-PyMySQL==0.7.10
+google-cloud-bigquery==0.24.0
+PyMySQL==0.7.11
 six==1.10.0
-SQLAlchemy==1.1.5
+SQLAlchemy==1.1.9
diff --git a/bigquery/rest/requirements.txt b/bigquery/rest/requirements.txt
@@ -1,2 +1,2 @@
-google-auth==0.8.0
+google-auth==1.0.0
 requests==2.13.0
diff --git a/bigtable/hello/requirements.txt b/bigtable/hello/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-bigtable==0.22.0
-google-cloud-core==0.23.0
+google-cloud-bigtable==0.24.0
+google-cloud-core==0.24.0
diff --git a/bigtable/hello_happybase/requirements.txt b/bigtable/hello_happybase/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-happybase==0.22.0
-google-cloud-core==0.23.0
+google-cloud-happybase==0.24.0
+google-cloud-core==0.24.0
diff --git a/blog/introduction_to_data_models_in_cloud_datastore/requirements.txt b/blog/introduction_to_data_models_in_cloud_datastore/requirements.txt
@@ -1 +1 @@
-google-cloud-datastore==0.22.1
+google-cloud-datastore==1.0.0
diff --git a/compute/encryption/requirements.txt b/compute/encryption/requirements.txt
@@ -1,2 +1,2 @@
-cryptography==1.7.2
+cryptography==1.8.1
 requests==2.13.0
diff --git a/compute/xmpp_wikibot/requirements.txt b/compute/xmpp_wikibot/requirements.txt
@@ -1,4 +1,4 @@
-Flask==0.12
+Flask==0.12.1
 requests==2.13.0
-sleekxmpp==1.3.1
+sleekxmpp==1.3.2
 six==1.10.0
diff --git a/container_engine/django_tutorial/requirements.txt b/container_engine/django_tutorial/requirements.txt
@@ -1,5 +1,5 @@
-Django==1.10.5
+Django==1.11
 mysqlclient==1.3.10
 wheel==0.29.0
-gunicorn==19.6.0
+gunicorn==19.7.1
 psycopg2==2.7.1
diff --git a/dataproc/requirements.txt b/dataproc/requirements.txt
@@ -1,2 +1,2 @@
 google-api-python-client==1.6.2
-google-cloud==0.22.0
+google-cloud==0.24.0
diff --git a/dns/api/requirements.txt b/dns/api/requirements.txt
@@ -1 +1 @@
-google-cloud-dns==0.22.0
+google-cloud-dns==0.24.0
diff --git a/endpoints/bookstore-grpc/requirements.txt b/endpoints/bookstore-grpc/requirements.txt
@@ -1,2 +1,2 @@
-grpcio==1.1.0
-google-auth==0.8.0
+grpcio==1.2.1
+google-auth==1.0.0
diff --git a/endpoints/getting-started-grpc/requirements.txt b/endpoints/getting-started-grpc/requirements.txt
@@ -1,2 +1,2 @@
-grpcio==1.1.3
-grpcio-tools==1.1.3
+grpcio==1.2.1
+grpcio-tools==1.2.1
diff --git a/endpoints/getting-started/requirements.txt b/endpoints/getting-started/requirements.txt
@@ -1,6 +1,6 @@
-Flask==0.12
+Flask==0.12.1
 flask-cors==3.0.2
-gunicorn==19.6.0
+gunicorn==19.7.1
 six==1.10.0
 pyyaml==3.12
 requests==2.13.0
diff --git a/error_reporting/report_exception_test.py b/error_reporting/report_exception_test.py
@@ -12,8 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import pytest
+
 import report_exception
 
 
+@pytest.mark.xfail(
+    strict=True,
+    reason='GoogleCloudPlatform/google-cloud-python#3263')
 def test_error_sends():
     report_exception.simulate_error()
diff --git a/error_reporting/requirements.txt b/error_reporting/requirements.txt
@@ -1 +1 @@
-google-cloud-error-reporting==0.22.0
+google-cloud-error-reporting==0.24.1
diff --git a/iap/app_engine_app/requirements.txt b/iap/app_engine_app/requirements.txt
@@ -1 +1 @@
-flask==0.12.0
+flask==0.12.1
diff --git a/iap/requirements.txt b/iap/requirements.txt
@@ -1,5 +1,5 @@
-PyJWT==1.4.2
-cryptography==1.7.2
-google-auth==0.8.0
+PyJWT==1.5.0
+cryptography==1.8.1
+google-auth==1.0.0
 requests==2.13.0
 requests_toolbelt==0.7.1
diff --git a/language/cloud-client/v1/snippets.py b/language/cloud-client/v1/snippets.py
@@ -24,12 +24,16 @@
 import argparse
 
 from google.cloud import language
+import six
 
 
 def sentiment_text(text):
     """Detects sentiment in the text."""
     language_client = language.Client()
 
+    if isinstance(text, six.binary_type):
+        text = text.decode('utf-8')
+
     # Instantiates a plain text document.
     document = language_client.document_from_text(text)
 
@@ -60,6 +64,9 @@ def entities_text(text):
     """Detects entities in the text."""
     language_client = language.Client()
 
+    if isinstance(text, six.binary_type):
+        text = text.decode('utf-8')
+
     # Instantiates a plain text document.
     document = language_client.document_from_text(text)
 
@@ -69,11 +76,11 @@ def entities_text(text):
 
     for entity in entities:
         print('=' * 20)
-        print('{:<16}: {}'.format('name', entity.name))
-        print('{:<16}: {}'.format('type', entity.entity_type))
-        print('{:<16}: {}'.format('metadata', entity.metadata))
-        print('{:<16}: {}'.format('salience', entity.salience))
-        print('{:<16}: {}'.format('wikipedia_url',
+        print(u'{:<16}: {}'.format('name', entity.name))
+        print(u'{:<16}: {}'.format('type', entity.entity_type))
+        print(u'{:<16}: {}'.format('metadata', entity.metadata))
+        print(u'{:<16}: {}'.format('salience', entity.salience))
+        print(u'{:<16}: {}'.format('wikipedia_url',
               entity.metadata.get('wikipedia_url', '-')))
 
 
@@ -90,18 +97,21 @@ def entities_file(gcs_uri):
 
     for entity in entities:
         print('=' * 20)
-        print('{:<16}: {}'.format('name', entity.name))
-        print('{:<16}: {}'.format('type', entity.entity_type))
-        print('{:<16}: {}'.format('metadata', entity.metadata))
-        print('{:<16}: {}'.format('salience', entity.salience))
-        print('{:<16}: {}'.format('wikipedia_url',
+        print(u'{:<16}: {}'.format('name', entity.name))
+        print(u'{:<16}: {}'.format('type', entity.entity_type))
+        print(u'{:<16}: {}'.format('metadata', entity.metadata))
+        print(u'{:<16}: {}'.format('salience', entity.salience))
+        print(u'{:<16}: {}'.format('wikipedia_url',
               entity.metadata.get('wikipedia_url', '-')))
 
 
 def syntax_text(text):
     """Detects syntax in the text."""
     language_client = language.Client()
 
+    if isinstance(text, six.binary_type):
+        text = text.decode('utf-8')
+
     # Instantiates a plain text document.
     document = language_client.document_from_text(text)
 
@@ -110,7 +120,7 @@ def syntax_text(text):
     tokens = document.analyze_syntax().tokens
 
     for token in tokens:
-        print('{}: {}'.format(token.part_of_speech, token.text_content))
+        print(u'{}: {}'.format(token.part_of_speech, token.text_content))
 
 
 def syntax_file(gcs_uri):
@@ -125,7 +135,7 @@ def syntax_file(gcs_uri):
     tokens = document.analyze_syntax().tokens
 
     for token in tokens:
-        print('{}: {}'.format(token.part_of_speech, token.text_content))
+        print(u'{}: {}'.format(token.part_of_speech, token.text_content))
 
 
 if __name__ == '__main__':
diff --git a/language/cloud-client/v1beta2/snippets.py b/language/cloud-client/v1beta2/snippets.py
@@ -27,21 +27,25 @@
 from google.cloud.gapic.language.v1beta2 import enums
 from google.cloud.gapic.language.v1beta2 import language_service_client
 from google.cloud.proto.language.v1beta2 import language_service_pb2
+import six
 
 
 def sentiment_text(text):
     """Detects sentiment in the text."""
     language_client = language.Client(api_version='v1beta2')
 
+    if isinstance(text, six.binary_type):
+        text = text.decode('utf-8')
+
     # Instantiates a plain text document.
     document = language_client.document_from_text(text)
 
     # Detects sentiment in the document. You can also analyze HTML with:
     #   document.doc_type == language.Document.HTML
     sentiment = document.analyze_sentiment().sentiment
 
-    print('Score: {}'.format(sentiment.score))
-    print('Magnitude: {}'.format(sentiment.magnitude))
+    print(u'Score: {}'.format(sentiment.score))
+    print(u'Magnitude: {}'.format(sentiment.magnitude))
 
 
 def sentiment_file(gcs_uri):
@@ -55,14 +59,17 @@ def sentiment_file(gcs_uri):
     #   document.doc_type == language.Document.HTML
     sentiment = document.analyze_sentiment().sentiment
 
-    print('Score: {}'.format(sentiment.score))
-    print('Magnitude: {}'.format(sentiment.magnitude))
+    print(u'Score: {}'.format(sentiment.score))
+    print(u'Magnitude: {}'.format(sentiment.magnitude))
 
 
 def entities_text(text):
     """Detects entities in the text."""
     language_client = language.Client(api_version='v1beta2')
 
+    if isinstance(text, six.binary_type):
+        text = text.decode('utf-8')
+
     # Instantiates a plain text document.
     document = language_client.document_from_text(text)
 
@@ -71,12 +78,12 @@ def entities_text(text):
     entities = document.analyze_entities().entities
 
     for entity in entities:
-        print('=' * 20)
-        print('{:<16}: {}'.format('name', entity.name))
-        print('{:<16}: {}'.format('type', entity.entity_type))
-        print('{:<16}: {}'.format('metadata', entity.metadata))
-        print('{:<16}: {}'.format('salience', entity.salience))
-        print('{:<16}: {}'.format('wikipedia_url',
+        print(u'=' * 20)
+        print(u'{:<16}: {}'.format('name', entity.name))
+        print(u'{:<16}: {}'.format('type', entity.entity_type))
+        print(u'{:<16}: {}'.format('metadata', entity.metadata))
+        print(u'{:<16}: {}'.format('salience', entity.salience))
+        print(u'{:<16}: {}'.format('wikipedia_url',
               entity.metadata.get('wikipedia_url', '-')))
 
 
@@ -105,6 +112,9 @@ def syntax_text(text):
     """Detects syntax in the text."""
     language_client = language.Client(api_version='v1beta2')
 
+    if isinstance(text, six.binary_type):
+        text = text.decode('utf-8')
+
     # Instantiates a plain text document.
     document = language_client.document_from_text(text)
 
@@ -113,7 +123,7 @@ def syntax_text(text):
     tokens = document.analyze_syntax().tokens
 
     for token in tokens:
-        print('{}: {}'.format(token.part_of_speech, token.text_content))
+        print(u'{}: {}'.format(token.part_of_speech, token.text_content))
 
 
 def syntax_file(gcs_uri):
@@ -128,14 +138,17 @@ def syntax_file(gcs_uri):
     tokens = document.analyze_syntax().tokens
 
     for token in tokens:
-        print('{}: {}'.format(token.part_of_speech, token.text_content))
+        print(u'{}: {}'.format(token.part_of_speech, token.text_content))
 
 
 def entity_sentiment_text(text):
     """Detects entity sentiment in the provided text."""
     language_client = language_service_client.LanguageServiceClient()
     document = language_service_pb2.Document()
 
+    if isinstance(text, six.binary_type):
+        text = text.decode('utf-8')
+
     document.content = text.encode('utf-8')
     document.type = enums.Document.Type.PLAIN_TEXT
 
@@ -144,15 +157,15 @@ def entity_sentiment_text(text):
 
     for entity in result.entities:
         print('Mentions: ')
-        print('Name: "{}"'.format(entity.name))
+        print(u'Name: "{}"'.format(entity.name))
         for mention in entity.mentions:
-            print('  Begin Offset : {}'.format(mention.text.begin_offset))
-            print('  Content : {}'.format(mention.text.content))
-            print('  Magnitude : {}'.format(mention.sentiment.magnitude))
-            print('  Sentiment : {}'.format(mention.sentiment.score))
-            print('  Type : {}'.format(mention.type))
-        print('Salience: {}'.format(entity.salience))
-        print('Sentiment: {}\n'.format(entity.sentiment))
+            print(u'  Begin Offset : {}'.format(mention.text.begin_offset))
+            print(u'  Content : {}'.format(mention.text.content))
+            print(u'  Magnitude : {}'.format(mention.sentiment.magnitude))
+            print(u'  Sentiment : {}'.format(mention.sentiment.score))
+            print(u'  Type : {}'.format(mention.type))
+        print(u'Salience: {}'.format(entity.salience))
+        print(u'Sentiment: {}\n'.format(entity.sentiment))
 
 
 def entity_sentiment_file(gcs_uri):
@@ -167,15 +180,15 @@ def entity_sentiment_file(gcs_uri):
       document, enums.EncodingType.UTF8)
 
     for entity in result.entities:
-        print('Name: "{}"'.format(entity.name))
+        print(u'Name: "{}"'.format(entity.name))
         for mention in entity.mentions:
-            print('  Begin Offset : {}'.format(mention.text.begin_offset))
-            print('  Content : {}'.format(mention.text.content))
-            print('  Magnitude : {}'.format(mention.sentiment.magnitude))
-            print('  Sentiment : {}'.format(mention.sentiment.score))
-            print('  Type : {}'.format(mention.type))
-        print('Salience: {}'.format(entity.salience))
-        print('Sentiment: {}\n'.format(entity.sentiment))
+            print(u'  Begin Offset : {}'.format(mention.text.begin_offset))
+            print(u'  Content : {}'.format(mention.text.content))
+            print(u'  Magnitude : {}'.format(mention.sentiment.magnitude))
+            print(u'  Sentiment : {}'.format(mention.sentiment.score))
+            print(u'  Type : {}'.format(mention.type))
+        print(u'Salience: {}'.format(entity.salience))
+        print(u'Sentiment: {}\n'.format(entity.sentiment))
 
 
 if __name__ == '__main__':
diff --git a/language/cloud-client/v1beta2/snippets_test.py b/language/cloud-client/v1beta2/snippets_test.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2017 Google, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,6 +27,15 @@ def test_sentiment_text(capsys):
     assert 'Score: 0' in out
 
 
+def test_sentiment_utf(capsys):
+    snippets.sentiment_text(
+        u'1er site d\'information. Les articles du journal et toute l\'' +
+        u'actualité en continu : International, France, Société, Economie, ' +
+        u'Culture, Environnement')
+    out, _ = capsys.readouterr()
+    assert 'Score: 0' in out
+
+
 def test_sentiment_file(capsys):
     snippets.sentiment_file(TEST_FILE_URL)
     out, _ = capsys.readouterr()
diff --git a/logging/cloud-client/requirements.txt b/logging/cloud-client/requirements.txt
@@ -1 +1 @@
-google-cloud-logging==0.22.0
+google-cloud-logging==1.0.0
diff --git a/ml_engine/online_prediction/predict_test.py b/ml_engine/online_prediction/predict_test.py
diff --git a/monitoring/api/v3/cloud-client/requirements.txt b/monitoring/api/v3/cloud-client/requirements.txt
diff --git a/nox.py b/nox.py
diff --git a/spanner/cloud-client/requirements.txt b/spanner/cloud-client/requirements.txt
diff --git a/storage/cloud-client/requirements.txt b/storage/cloud-client/requirements.txt
diff --git a/testing/requirements.txt b/testing/requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-google-auth==0.8.0`
	`1`	`+google-auth==1.0.0`
`2`	`2`	`requests==2.13.0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-google-cloud-datastore==0.22.1`
	`1`	`+google-cloud-datastore==1.0.0`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-cryptography==1.7.2`
	`1`	`+cryptography==1.8.1`
`2`	`2`	`requests==2.13.0`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`google-api-python-client==1.6.2`
`2`		`-google-cloud==0.22.0`
	`2`	`+google-cloud==0.24.0`