Merge branch 'master' into audio_profile

happyhuman · happyhuman · commit e2d5a62ad9df · 2018-06-27T10:40:22.000-07:00
diff --git a/.kokoro/presubmit_tests_dlp.cfg b/.kokoro/presubmit_tests_dlp.cfg
@@ -0,0 +1,15 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download secrets from Cloud Storage.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/python-docs-samples/.kokoro/system_tests.sh"
+}
+
+env_vars: {
+    key: "NOX_SESSION"
+    value: "dlp and py36 and not appengine"
+}
diff --git a/.kokoro/presubmit_tests_tasks.cfg b/.kokoro/presubmit_tests_tasks.cfg
@@ -0,0 +1,15 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download secrets from Cloud Storage.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/python-docs-samples/.kokoro/system_tests.sh"
+}
+
+env_vars: {
+    key: "NOX_SESSION"
+    value: "tasks and py36 and not appengine"
+}
diff --git a/.kokoro/system_tests_dlp.cfg b/.kokoro/system_tests_dlp.cfg
@@ -0,0 +1,15 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download secrets from Cloud Storage.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/python-docs-samples/.kokoro/system_tests.sh"
+}
+
+env_vars: {
+    key: "NOX_SESSION"
+    value: "dlp and py36 and not appengine"
+}
diff --git a/.kokoro/system_tests_tasks.cfg b/.kokoro/system_tests_tasks.cfg
@@ -0,0 +1,15 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download secrets from Cloud Storage.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/python-docs-samples/.kokoro/system_tests.sh"
+}
+
+env_vars: {
+    key: "NOX_SESSION"
+    value: "tasks and py36 and not appengine"
+}
diff --git a/appengine/standard/endpoints-frameworks-v2/echo/main.py b/appengine/standard/endpoints-frameworks-v2/echo/main.py
@@ -17,9 +17,9 @@
 
 # [START imports]
 import endpoints
-from protorpc import message_types
-from protorpc import messages
-from protorpc import remote
+from endpoints import message_types
+from endpoints import messages
+from endpoints import remote
 # [END imports]
 
 
diff --git a/appengine/standard/endpoints-frameworks-v2/echo/main_test.py b/appengine/standard/endpoints-frameworks-v2/echo/main_test.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import endpoints
+from endpoints import message_types
 import mock
-from protorpc import message_types
 import pytest
 
 import main
diff --git a/appengine/standard/endpoints-frameworks-v2/echo/requirements.txt b/appengine/standard/endpoints-frameworks-v2/echo/requirements.txt
@@ -1,2 +1,2 @@
-google-endpoints==3.0.0
-google-endpoints-api-management==1.5.1
+google-endpoints==4.4.0
+google-endpoints-api-management==1.8.0
diff --git a/appengine/standard/endpoints-frameworks-v2/iata/main.py b/appengine/standard/endpoints-frameworks-v2/iata/main.py
@@ -17,9 +17,9 @@
 
 # [START imports]
 import endpoints
-from protorpc import message_types
-from protorpc import messages
-from protorpc import remote
+from endpoints import message_types
+from endpoints import messages
+from endpoints import remote
 
 from data import AIRPORTS
 # [END imports]
diff --git a/appengine/standard/endpoints-frameworks-v2/iata/requirements.txt b/appengine/standard/endpoints-frameworks-v2/iata/requirements.txt
@@ -1,2 +1,2 @@
-google-endpoints==3.0.0
-google-endpoints-api-management==1.5.1
+google-endpoints==4.4.0
+google-endpoints-api-management==1.8.0
diff --git a/appengine/standard/endpoints-frameworks-v2/quickstart/main.py b/appengine/standard/endpoints-frameworks-v2/quickstart/main.py
@@ -17,9 +17,9 @@
 
 # [START imports]
 import endpoints
-from protorpc import message_types
-from protorpc import messages
-from protorpc import remote
+from endpoints import message_types
+from endpoints import messages
+from endpoints import remote
 # [END imports]
 
 
diff --git a/appengine/standard/endpoints-frameworks-v2/quickstart/main_test.py b/appengine/standard/endpoints-frameworks-v2/quickstart/main_test.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from endpoints import message_types
 import mock
-from protorpc import message_types
 
 import main
 
diff --git a/texttospeech/cloud-client/README.rst b/texttospeech/cloud-client/README.rst
@@ -7,7 +7,7 @@ Google Cloud Text-to-Speech API Python Samples
    :target: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=/README.rst
 
 
-This directory contains samples for Google Cloud Text-to-Speech API. The `Google Cloud Text To Speech API`_ enables you to generate and customize synthesized speech from text or SSML.
+This directory contains samples for Google Cloud Text-to-Speech API. The `Google Cloud Text-to-Speech API`_ enables you to generate and customize synthesized speech from text or SSML.
 
 
 
@@ -170,4 +170,4 @@ to `browse the source`_ and  `report issues`_.
     https://github.com/GoogleCloudPlatform/google-cloud-python/issues
 
 
-.. _Google Cloud SDK: https://cloud.google.com/sdk/
+.. _Google Cloud SDK: https://cloud.google.com/sdk/
diff --git a/texttospeech/cloud-client/requirements.txt b/texttospeech/cloud-client/requirements.txt
@@ -1 +1 @@
-google-cloud-texttospeech==0.2.0
+google-cloud-texttospeech==0.1.0
diff --git a/vision/cloud-client/detect/detect_test.py b/vision/cloud-client/detect/detect_test.py
@@ -222,14 +222,14 @@ def test_detect_web_with_geo(capsys):
         'resources/city.jpg')
     detect.web_entities_include_geo_results(file_name)
     out, _ = capsys.readouterr()
-    assert 'Zepra' in out
+    assert 'Zepra' in out or 'Electra Tower' in out
 
 
 def test_detect_web_with_geo_uri(capsys):
     file_name = 'gs://{}/vision/city.jpg'.format(BUCKET)
     detect.web_entities_include_geo_results_uri(file_name)
     out, _ = capsys.readouterr()
-    assert 'Zepra' in out
+    assert 'Zepra' in out or 'Electra Tower' in out
 
 
 def test_detect_document(capsys):

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-google-cloud-texttospeech==0.2.0`
	`1`	`+google-cloud-texttospeech==0.1.0`