From 18f9951f5912c30cb09e16c9e55a0c432fc9b1e7 Mon Sep 17 00:00:00 2001 From: Emmanuel Alejandro Parada Licea Date: Mon, 20 Jan 2025 13:29:23 -0600 Subject: [PATCH 1/4] chore(gae): delete regions from migration/ndb/overview/main.py --- appengine/standard/migration/ndb/overview/main.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/appengine/standard/migration/ndb/overview/main.py b/appengine/standard/migration/ndb/overview/main.py index a714e50ca34..97fbd8e4495 100644 --- a/appengine/standard/migration/ndb/overview/main.py +++ b/appengine/standard/migration/ndb/overview/main.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# [START all] from flask import Flask, redirect, render_template, request from google.cloud import ndb @@ -25,15 +24,12 @@ client = ndb.Client() -# [START greeting] class Greeting(ndb.Model): """Models an individual Guestbook entry with content and date.""" content = ndb.StringProperty() date = ndb.DateTimeProperty(auto_now_add=True) - # [END greeting] - # [START query] with client.context(): @classmethod @@ -48,7 +44,6 @@ def display_guestbook(): with client.context(): ancestor_key = ndb.Key("Book", guestbook_name or "*notitle*") greetings = Greeting.query_book(ancestor_key).fetch(20) - # [END query] greeting_blockquotes = [greeting.content for greeting in greetings] return render_template( @@ -58,7 +53,6 @@ def display_guestbook(): ) -# [START submit] @app.route("/sign", methods=["POST"]) def update_guestbook(): # We set the parent key on each 'Greeting' to ensure each guestbook's @@ -73,7 +67,6 @@ def update_guestbook(): content=request.form.get("content", None), ) greeting.put() - # [END submit] return redirect("/?" + urlencode({"guestbook_name": guestbook_name})) @@ -81,4 +74,3 @@ def update_guestbook(): if __name__ == "__main__": # This is used when running locally. app.run(host="127.0.0.1", port=8080, debug=True) -# [END all] From c802a2163a54b33e5dd7bd602341b428221e0861 Mon Sep 17 00:00:00 2001 From: Emmanuel Alejandro Parada Licea Date: Mon, 20 Jan 2025 13:30:44 -0600 Subject: [PATCH 2/4] chore(gae): add support for Python 3 to requirements-test.txt --- .../standard/migration/ndb/overview/requirements-test.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appengine/standard/migration/ndb/overview/requirements-test.txt b/appengine/standard/migration/ndb/overview/requirements-test.txt index 7439fc43d48..454c88a573a 100644 --- a/appengine/standard/migration/ndb/overview/requirements-test.txt +++ b/appengine/standard/migration/ndb/overview/requirements-test.txt @@ -1,2 +1,6 @@ # pin pytest to 4.6.11 for Python2. pytest==4.6.11; python_version < '3.0' + +# pytest==8.3.4 and six==1.17.0 for Python3. +pytest==8.3.4; python_version >= '3.0' +six==1.17.0 \ No newline at end of file From 17de5766d6c16257999be0601fab7cfbac429201 Mon Sep 17 00:00:00 2001 From: Emmanuel Alejandro Parada Licea Date: Mon, 20 Jan 2025 13:31:29 -0600 Subject: [PATCH 3/4] chore(gae): fix whitespace in templates/index.html --- appengine/standard/migration/ndb/overview/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/standard/migration/ndb/overview/templates/index.html b/appengine/standard/migration/ndb/overview/templates/index.html index 969634d22b9..b16f01e0edb 100644 --- a/appengine/standard/migration/ndb/overview/templates/index.html +++ b/appengine/standard/migration/ndb/overview/templates/index.html @@ -43,4 +43,4 @@ - + From 763bbabb133856dc4f4b531e789df937252bdf26 Mon Sep 17 00:00:00 2001 From: Emmanuel Alejandro Parada Licea Date: Mon, 20 Jan 2025 13:35:38 -0600 Subject: [PATCH 4/4] docs(gae): update README.md to a current Python 3 sample --- appengine/standard/migration/ndb/overview/README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/appengine/standard/migration/ndb/overview/README.md b/appengine/standard/migration/ndb/overview/README.md index c91442a5e08..8bd2d9e6cba 100644 --- a/appengine/standard/migration/ndb/overview/README.md +++ b/appengine/standard/migration/ndb/overview/README.md @@ -11,11 +11,6 @@ with the [Google Cloud NDB library](https://googleapis.dev/python/python-ndb/lat This library can be used not only on App Engine, but also other Python 3 platforms. -To deploy and run this sample in App Engine standard for Python 2.7: - - pip install -t lib -r requirements.txt - gcloud app deploy - -To deploy and run this sample in App Engine standard for Python 3.7: +To deploy and run this sample in App Engine standard for Python 3.8: gcloud app deploy app3.yaml