Merge branch 'master' into mlengine

elibixby · elibixby · commit bb1e53825890 · 2017-03-13T14:22:54.000-07:00
diff --git a/appengine/flexible/cloudsql/requirements.txt b/appengine/flexible/cloudsql/requirements.txt
@@ -2,3 +2,4 @@ Flask==0.12
 Flask-SQLAlchemy==2.1
 gunicorn==19.6.0
 PyMySQL==0.7.10
+psycopg2==2.6.2
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
 pyjwt==1.4.2
 flask-cors==3.0.2
-google-auth==0.7.0
+google-auth==0.8.0
 requests==2.13.0
 requests-toolbelt==0.7.1
diff --git a/bigquery/rest/requirements.txt b/bigquery/rest/requirements.txt
@@ -1,2 +1,2 @@
-google-auth==0.7.0
+google-auth==0.8.0
 requests==2.13.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.7.0
+google-auth==0.8.0
diff --git a/speech/grpc/requirements.txt b/speech/grpc/requirements.txt
@@ -1,6 +1,6 @@
 grpcio==1.1.0
 PyAudio==0.2.10
-grpc-google-cloud-speech-v1beta1==0.14.0
+proto-google-cloud-speech-v1beta1==0.15.1
 six==1.10.0
 requests==2.13.0
-google-auth==0.7.0
+google-auth==0.8.0
diff --git a/speech/grpc/transcribe.py b/speech/grpc/transcribe.py
@@ -24,7 +24,7 @@
 import google.auth
 import google.auth.transport.grpc
 import google.auth.transport.requests
-from google.cloud.grpc.speech.v1beta1 import cloud_speech_pb2
+from google.cloud.proto.speech.v1beta1 import cloud_speech_pb2
 
 # Keep the request alive for this many seconds
 DEADLINE_SECS = 60
diff --git a/speech/grpc/transcribe_async.py b/speech/grpc/transcribe_async.py
@@ -28,7 +28,7 @@
 import google.auth
 import google.auth.transport.grpc
 import google.auth.transport.requests
-from google.cloud.grpc.speech.v1beta1 import cloud_speech_pb2
+from google.cloud.proto.speech.v1beta1 import cloud_speech_pb2
 from google.longrunning import operations_pb2
 
 # Keep the request alive for this many seconds
diff --git a/speech/grpc/transcribe_streaming.py b/speech/grpc/transcribe_streaming.py
@@ -26,7 +26,7 @@
 import google.auth
 import google.auth.transport.grpc
 import google.auth.transport.requests
-from google.cloud.grpc.speech.v1beta1 import cloud_speech_pb2
+from google.cloud.proto.speech.v1beta1 import cloud_speech_pb2
 from google.rpc import code_pb2
 import grpc
 import pyaudio

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-google-auth==0.7.0`
	`1`	`+google-auth==0.8.0`
`2`	`2`	`requests==2.13.0`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`grpcio==1.1.0`
`2`		`-google-auth==0.7.0`
	`2`	`+google-auth==0.8.0`