From 69f070e7d686d6563971e2326ff752640ce0ef92 Mon Sep 17 00:00:00 2001 From: Maciek Ruckgaber Date: Tue, 20 Feb 2018 12:31:24 +0100 Subject: [PATCH 1/3] Fixes Dockerfile to actually use python3.5 --- endpoints/bookstore-grpc/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/endpoints/bookstore-grpc/Dockerfile b/endpoints/bookstore-grpc/Dockerfile index 7f62eb85593..5f7fb84505a 100644 --- a/endpoints/bookstore-grpc/Dockerfile +++ b/endpoints/bookstore-grpc/Dockerfile @@ -5,11 +5,11 @@ FROM gcr.io/google_appengine/python # Create a virtualenv for dependencies. This isolates these packages from # system-level packages. -RUN virtualenv /env +RUN virtualenv -p python3.5 /env # Setting these environment variables are the same as running # source /env/bin/activate. -ENV VIRTUAL_ENV -p python3.5 /env +ENV VIRTUAL_ENV /env ENV PATH /env/bin:$PATH ADD . /bookstore/ From f977bfcbcb13066dcb9eeb4a8b9427051a3d637c Mon Sep 17 00:00:00 2001 From: Maciek Ruckgaber Date: Tue, 20 Feb 2018 12:53:31 +0100 Subject: [PATCH 2/3] Fixes bad module import --- endpoints/bookstore-grpc/status.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/endpoints/bookstore-grpc/status.py b/endpoints/bookstore-grpc/status.py index 3808e9931e8..3248d27d03a 100644 --- a/endpoints/bookstore-grpc/status.py +++ b/endpoints/bookstore-grpc/status.py @@ -14,7 +14,7 @@ from contextlib import contextmanager -import status +import grpc @contextmanager @@ -23,6 +23,6 @@ def context(grpc_context): try: yield except KeyError as key_error: - grpc_context.code(status.Code.NOT_FOUND) + grpc_context.code(grpc.StatusCode.NOT_FOUND) grpc_context.details( 'Unable to find the item keyed by {}'.format(key_error)) From 4b8c6a3c8a2d88ff9d8ae662194df0971c1722da Mon Sep 17 00:00:00 2001 From: Maciek Ruckgaber Date: Tue, 20 Feb 2018 20:04:03 +0100 Subject: [PATCH 3/3] Upgrades to use python 3.6 --- endpoints/bookstore-grpc/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/endpoints/bookstore-grpc/Dockerfile b/endpoints/bookstore-grpc/Dockerfile index 5f7fb84505a..d8a0773cb29 100644 --- a/endpoints/bookstore-grpc/Dockerfile +++ b/endpoints/bookstore-grpc/Dockerfile @@ -5,7 +5,7 @@ FROM gcr.io/google_appengine/python # Create a virtualenv for dependencies. This isolates these packages from # system-level packages. -RUN virtualenv -p python3.5 /env +RUN virtualenv -p python3.6 /env # Setting these environment variables are the same as running # source /env/bin/activate.