From fe615aeb24b31d05ae17d5169c9c8af1648914c7 Mon Sep 17 00:00:00 2001 From: michaelawyu Date: Tue, 7 Nov 2017 16:14:45 -0800 Subject: [PATCH 1/2] Fixed b/65407087 --- appengine/standard/flask/hello_world/README.md | 5 ----- appengine/standard/flask/hello_world/app.yaml | 4 ++++ .../flask/hello_world/appengine_config.py | 18 ------------------ .../flask/hello_world/requirements.txt | 1 - testing/requirements.txt | 1 + 5 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 appengine/standard/flask/hello_world/appengine_config.py delete mode 100644 appengine/standard/flask/hello_world/requirements.txt diff --git a/appengine/standard/flask/hello_world/README.md b/appengine/standard/flask/hello_world/README.md index 04ec9402ab1..e2749c87e56 100644 --- a/appengine/standard/flask/hello_world/README.md +++ b/appengine/standard/flask/hello_world/README.md @@ -3,9 +3,4 @@ This sample shows how to use [Flask](http://flask.pocoo.org/) with Google App Engine Standard. -Before running or deploying this application, install the dependencies using -[pip](http://pip.readthedocs.io/en/stable/): - - pip install -t lib -r requirements.txt - For more information, see the [App Engine Standard README](../../README.md) diff --git a/appengine/standard/flask/hello_world/app.yaml b/appengine/standard/flask/hello_world/app.yaml index f041d384c05..52d6f8be6d2 100644 --- a/appengine/standard/flask/hello_world/app.yaml +++ b/appengine/standard/flask/hello_world/app.yaml @@ -5,3 +5,7 @@ threadsafe: true handlers: - url: /.* script: main.app + +libraries: +- name: flask + version: latest \ No newline at end of file diff --git a/appengine/standard/flask/hello_world/appengine_config.py b/appengine/standard/flask/hello_world/appengine_config.py deleted file mode 100644 index c903d9a0ac5..00000000000 --- a/appengine/standard/flask/hello_world/appengine_config.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2016 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from google.appengine.ext import vendor - -# Add any libraries installed in the "lib" folder. -vendor.add('lib') diff --git a/appengine/standard/flask/hello_world/requirements.txt b/appengine/standard/flask/hello_world/requirements.txt deleted file mode 100644 index 52ab1a39019..00000000000 --- a/appengine/standard/flask/hello_world/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -Flask==0.12.2 diff --git a/testing/requirements.txt b/testing/requirements.txt index e51938b0d19..2facfd98650 100644 --- a/testing/requirements.txt +++ b/testing/requirements.txt @@ -15,3 +15,4 @@ webapp2==2.5.2 google-api-python-client==1.6.4 google-cloud-core==0.28.0 gcp-devrel-py-tools==0.0.11 +flask==0.12 \ No newline at end of file From 6902f0fd09afcb49320ff2976ed7d91dd5d5e5b0 Mon Sep 17 00:00:00 2001 From: michaelawyu Date: Wed, 8 Nov 2017 14:52:06 -0800 Subject: [PATCH 2/2] Added version number for flask --- appengine/standard/flask/hello_world/app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/standard/flask/hello_world/app.yaml b/appengine/standard/flask/hello_world/app.yaml index 52d6f8be6d2..bab91f281de 100644 --- a/appengine/standard/flask/hello_world/app.yaml +++ b/appengine/standard/flask/hello_world/app.yaml @@ -8,4 +8,4 @@ handlers: libraries: - name: flask - version: latest \ No newline at end of file + version: 0.12