Skip to content

Fixes python version flag & bad import in context manager #1368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 20, 2018
Merged

Fixes python version flag & bad import in context manager #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69f070e
Fixes Dockerfile to actually use python3.5
maciekrb Feb 20, 2018
f977bfc
Fixes bad module import
maciekrb Feb 20, 2018
4b8c6a3
Upgrades to use python 3.6
maciekrb Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions endpoints/bookstore-grpc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6 /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/
Expand Down
4 changes: 2 additions & 2 deletions endpoints/bookstore-grpc/status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

from contextlib import contextmanager

import status
import grpc


@contextmanager
Expand All @@ -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))