chore: Merge branch 'main' into jackwotherspoon-patch-1

Author: jackwotherspoon

.kokoro/tests/run_tests.sh

@@ -108,16 +108,18 @@ fi
 # On kokoro, we should be able to use the default service account. We
 # need to somehow bootstrap the secrets on other CI systems.
 if [[ "${TRAMPOLINE_CI}" == "kokoro" ]]; then
-    # This script will create 4 files:
+    # This script will create 5 files:
     # - testing/test-env.sh
     # - testing/service-account.json
     # - testing/client-secrets.json
     # - testing/cloudai-samples-secrets.sh
+    # - testing/cloudsql-samples-secrets.sh
     ./scripts/decrypt-secrets.sh
 fi
 
 source ./testing/test-env.sh
 source ./testing/cloudai-samples-secrets.sh
+source ./testing/cloudsql-samples-secrets.sh
 export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/testing/service-account.json
 
 # For cloud-run session, we activate the service account for gcloud sdk.
@@ -209,7 +211,7 @@ cd "$ROOT"
 
 # Remove secrets if we used decrypt-secrets.sh.
 if [[ -f "${KOKORO_GFILE_DIR}/secrets_viewer_service_account.json" ]]; then
-    rm testing/{test-env.sh,client-secrets.json,service-account.json,cloudai-samples-secrets.sh}
+    rm testing/{test-env.sh,client-secrets.json,service-account.json,cloudai-samples-secrets.sh,cloudsql-samples-secrets.sh}
 fi
 
 exit "$RTN"

appengine/flexible/django_cloudsql/requirements.txt

@@ -1,5 +1,5 @@
-Django==5.1.4; python_version >= "3.10"
-Django==4.2.17; python_version >= "3.8" and python_version < "3.10"
+Django==5.1.5; python_version >= "3.10"
+Django==5.1.5; python_version >= "3.8" and python_version < "3.10"
 gunicorn==22.0.0
 psycopg2-binary==2.9.10
 django-environ==0.11.2

appengine/flexible/hello_world_django/requirements.txt

@@ -1,4 +1,4 @@
-Django==5.1.4; python_version >= "3.10"
-Django==4.2.17; python_version >= "3.8" and python_version < "3.10"
-Django==3.2.25; python_version < "3.8"
+Django==5.1.5; python_version >= "3.10"
+Django==5.1.5; python_version >= "3.8" and python_version < "3.10"
+Django==5.1.5; python_version < "3.8"
 gunicorn==22.0.0

appengine/flexible_python37_and_earlier/django_cloudsql/requirements.txt

@@ -1,6 +1,6 @@
-Django==5.1.4; python_version >= "3.10"
-Django==4.2.17; python_version >= "3.8" and python_version < "3.10"
-Django==3.2.25; python_version < "3.8"
+Django==5.1.5; python_version >= "3.10"
+Django==5.1.5; python_version >= "3.8" and python_version < "3.10"
+Django==5.1.5; python_version < "3.8"
 gunicorn==22.0.0
 psycopg2-binary==2.9.10
 django-environ==0.11.2

appengine/flexible_python37_and_earlier/hello_world_django/requirements.txt

@@ -1,4 +1,4 @@
-Django==5.1.4; python_version >= "3.10"
-Django==4.2.17; python_version >= "3.8" and python_version < "3.10"
-Django==3.2.25; python_version < "3.8"
+Django==5.1.5; python_version >= "3.10"
+Django==5.1.5; python_version >= "3.8" and python_version < "3.10"
+Django==5.1.5; python_version < "3.8"
 gunicorn==22.0.0

appengine/standard/images/guestbook/main.py

@@ -18,32 +18,29 @@
 For more information, see README.md.
 """
 
-# [START all]
-
+# [START gae_images_guestbook_all]
 import cgi
 import urllib
 
-# [START import_images]
+# [START gae_images_guestbook_import_images]
 from google.appengine.api import images
+# [END gae_images_guestbook_import_images]
 
-# [END import_images]
 from google.appengine.api import users
 from google.appengine.ext import ndb
 
 import webapp2
 
 
-# [START model]
+# [START gae_images_guestbook_model]
 class Greeting(ndb.Model):
     """Models a Guestbook entry with an author, content, avatar, and date."""
 
     author = ndb.StringProperty()
     content = ndb.TextProperty()
     avatar = ndb.BlobProperty()
     date = ndb.DateTimeProperty(auto_now_add=True)
-
-
-# [END model]
+# [END gae_images_guestbook_model]
 
 
 def guestbook_key(guestbook_name=None):
@@ -67,16 +64,16 @@ def get(self):
                 self.response.out.write("<b>%s</b> wrote:" % greeting.author)
             else:
                 self.response.out.write("An anonymous person wrote:")
-            # [START display_image]
+            # [START gae_images_guestbook_display_image]
             self.response.out.write(
                 '<div><img src="/img?img_id=%s"></img>' % greeting.key.urlsafe()
             )
             self.response.out.write(
                 "<blockquote>%s</blockquote></div>" % cgi.escape(greeting.content)
             )
-            # [END display_image]
+            # [END gae_images_guestbook_display_image]
 
-        # [START form]
+        # [START gae_images_guestbook_form]
         self.response.out.write(
             """
               <form action="/sign?%s"
@@ -99,10 +96,10 @@ def get(self):
                 cgi.escape(guestbook_name),
             )
         )
-        # [END form]
+        # [END gae_images_guestbook_form]
 
 
-# [START image_handler]
+# [START gae_images_guestbook_image_handler]
 class Image(webapp2.RequestHandler):
     def get(self):
         greeting_key = ndb.Key(urlsafe=self.request.get("img_id"))
@@ -112,12 +109,10 @@ def get(self):
             self.response.out.write(greeting.avatar)
         else:
             self.response.out.write("No image")
+# [END gae_images_guestbook_image_handler]
 
 
-# [END image_handler]
-
-
-# [START sign_handler]
+# [START gae_images_guestbook_sign_handler]
 class Guestbook(webapp2.RequestHandler):
     def post(self):
         guestbook_name = self.request.get("guestbook_name")
@@ -128,24 +123,18 @@ def post(self):
 
         greeting.content = self.request.get("content")
 
-        # [START sign_handler_1]
         avatar = self.request.get("img")
-        # [END sign_handler_1]
-        # [START transform]
+        # [START gae_images_guestbook_transform]
         avatar = images.resize(avatar, 32, 32)
-        # [END transform]
-        # [START sign_handler_2]
+        # [END gae_images_guestbook_transform]
         greeting.avatar = avatar
         greeting.put()
-        # [END sign_handler_2]
 
         self.redirect("/?" + urllib.urlencode({"guestbook_name": guestbook_name}))
-
-
-# [END sign_handler]
+# [END gae_images_guestbook_sign_handler]
 
 
 app = webapp2.WSGIApplication(
     [("/", MainPage), ("/img", Image), ("/sign", Guestbook)], debug=True
 )
-# [END all]
+# [END gae_images_guestbook_all]

appengine/standard/mailjet/requirements-test.txt

@@ -1,4 +1,9 @@
 # pin pytest to 4.6.11 for Python2.
 pytest==4.6.11; python_version < '3.0'
+
 responses==0.17.0; python_version < '3.7'
 responses==0.23.1; python_version > '3.6'
+
+# pytest==8.3.4 and six==1.17.0 for Python3.
+pytest==8.3.4; python_version >= '3.0'
+six==1.17.0

appengine/standard/mailjet/templates/index.html

@@ -19,11 +19,9 @@
   <title>Mailjet on Google App Engine</title>
 </head>
 <body>
-<!-- [START form] -->
 <form method="post" action="/send/email">
   <input type="text" name="to" placeholder="Enter recipient email">
   <input type="submit" name="submit" value="Send email">
 </form>
-<!-- [END form] -->
 </body>
 </html>

appengine/standard/memcache/guestbook/main.py

@@ -18,8 +18,7 @@
 For more information, see README.md.
 """
 
-# [START all]
-
+# [START gae_memcache_guestbook_all]
 import cgi
 import cStringIO
 import logging
@@ -73,7 +72,7 @@ def get(self):
             )
         )
 
-    # [START check_memcache]
+    # [START gae_memcache_guestbook_check_memcache]
     def get_greetings(self, guestbook_name):
         """
         get_greetings()
@@ -98,10 +97,9 @@ def get_greetings(self, guestbook_name):
             except ValueError:
                 logging.error("Memcache set failed - data larger than 1MB")
         return greetings
+    # [END gae_memcache_guestbook_check_memcache]
 
-    # [END check_memcache]
-
-    # [START query_datastore]
+    # [START gae_memcache_guestbook_query_datastore]
     def render_greetings(self, guestbook_name):
         """
         render_greetings()
@@ -131,8 +129,7 @@ def render_greetings(self, guestbook_name):
                 "<blockquote>{}</blockquote>".format(cgi.escape(greeting.content))
             )
         return output.getvalue()
-
-    # [END query_datastore]
+    # [END gae_memcache_guestbook_query_datastore]
 
 
 class Guestbook(webapp2.RequestHandler):
@@ -155,4 +152,4 @@ def post(self):
 
 app = webapp2.WSGIApplication([("/", MainPage), ("/sign", Guestbook)], debug=True)
 
-# [END all]
+# [END gae_memcache_guestbook_all]

appengine/standard/migration/incoming/main.py

@@ -17,10 +17,10 @@
 """
 
 # [START gae_python_app_identity_incoming]
-from google.oauth2 import id_token
-from google.auth.transport import requests
-
 import logging
+
+from google.auth.transport import requests
+from google.oauth2 import id_token
 import webapp2