chore: Merge branch 'main' into fix-cloud-sql-env-vars

GoogleCloudPlatform · Jan 22, 2025 · 95a6d8a · 95a6d8a
2 parents 1d53d17 + 72190ce
commit 95a6d8a
Show file tree

Hide file tree

Showing 128 changed files with 262 additions and 275 deletions.
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -45,7 +45,7 @@ branchProtectionRules:
     - "Kokoro CI - Lint"
     - "Kokoro CI - Python 2.7 (App Engine Standard Only)"
     - "Kokoro CI - Python 3.8"
-    - "Kokoro CI - Python 3.12"
+    - "Kokoro CI - Python 3.13"
     - "cla/google"
     - "snippet-bot check"
 # List of explicit permissions to add (additive only)

diff --git a/alloydb/notebooks/noxfile_config.py b/alloydb/notebooks/noxfile_config.py
@@ -14,7 +14,7 @@
 
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
-    "ignored_versions": ["2.7", "3.7", "3.8", "3.9", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.7", "3.8", "3.9", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": True,

diff --git a/appengine/flexible/django_cloudsql/noxfile_config.py b/appengine/flexible/django_cloudsql/noxfile_config.py
@@ -22,7 +22,7 @@
 
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
-    "ignored_versions": ["2.7", "3.7", "3.9", "3.10", "3.12"],
+    "ignored_versions": ["2.7", "3.7", "3.9", "3.10", "3.12", "3.13"],
     # An envvar key for determining the project id to use. Change it
     # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
     # build specific Cloud project. You can also use your own string

diff --git a/appengine/flexible/django_cloudsql/requirements.txt b/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

diff --git a/appengine/flexible/hello_world_django/requirements.txt b/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
diff --git a/appengine/flexible/numpy/noxfile_config.py b/appengine/flexible/numpy/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.7", "3.12"],
+    "ignored_versions": ["2.7", "3.7", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible/scipy/noxfile_config.py b/appengine/flexible/scipy/noxfile_config.py
@@ -22,7 +22,7 @@
 
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
-    "ignored_versions": ["2.7", "3.7", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.7", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/analytics/noxfile_config.py b/appengine/flexible_python37_and_earlier/analytics/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/datastore/noxfile_config.py b/appengine/flexible_python37_and_earlier/datastore/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/disk/noxfile_config.py b/appengine/flexible_python37_and_earlier/disk/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/django_cloudsql/noxfile_config.py b/appengine/flexible_python37_and_earlier/django_cloudsql/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/django_cloudsql/requirements.txt b/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

diff --git a/appengine/flexible_python37_and_earlier/extending_runtime/noxfile_config.py b/appengine/flexible_python37_and_earlier/extending_runtime/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/hello_world/noxfile_config.py b/appengine/flexible_python37_and_earlier/hello_world/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/hello_world_django/noxfile_config.py b/appengine/flexible_python37_and_earlier/hello_world_django/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/hello_world_django/requirements.txt b/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
diff --git a/appengine/flexible_python37_and_earlier/metadata/noxfile_config.py b/appengine/flexible_python37_and_earlier/metadata/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/multiple_services/noxfile_config.py b/appengine/flexible_python37_and_earlier/multiple_services/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/numpy/noxfile_config.py b/appengine/flexible_python37_and_earlier/numpy/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/pubsub/noxfile_config.py b/appengine/flexible_python37_and_earlier/pubsub/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/scipy/noxfile_config.py b/appengine/flexible_python37_and_earlier/scipy/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/static_files/noxfile_config.py b/appengine/flexible_python37_and_earlier/static_files/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/storage/noxfile_config.py b/appengine/flexible_python37_and_earlier/storage/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": True,

diff --git a/appengine/flexible_python37_and_earlier/tasks/noxfile_config.py b/appengine/flexible_python37_and_earlier/tasks/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/twilio/noxfile_config.py b/appengine/flexible_python37_and_earlier/twilio/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/flexible_python37_and_earlier/websockets/noxfile_config.py b/appengine/flexible_python37_and_earlier/websockets/noxfile_config.py
@@ -23,7 +23,7 @@
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
     # Skipping for Python 3.9 due to pyarrow compilation failure.
-    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": False,

diff --git a/appengine/standard/images/guestbook/main.py b/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]
diff --git a/appengine/standard/mailjet/requirements-test.txt b/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
diff --git a/appengine/standard/mailjet/templates/index.html b/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>