chores(deps): update to Django 5, where supported by Python (GoogleCloudPlatform#10998)

* cleanup: change all django doc links to 'stable' * fix: Update Django dependencies to match major Python version support * chores(deps): update dependency psycopg2-binary to v2.9.9 * revert: appengine/standard_python3/bundled-services (flakytest)

Author: glasnt

appengine/flexible/django_cloudsql/README.md

@@ -7,7 +7,7 @@
 
 This repository is an example of how to run a [Django](https://www.djangoproject.com/) 
 app on Google App Engine Flexible Environment. It uses the 
-[Writing your first Django app](https://docs.djangoproject.com/en/3.2/intro/tutorial01/) as the 
+[Writing your first Django app](https://docs.djangoproject.com/en/stable/intro/tutorial01/) as the 
 example app to deploy.
 
 

appengine/flexible/django_cloudsql/mysite/settings.py

@@ -150,7 +150,7 @@
 ]
 
 # Internationalization
-# https://docs.djangoproject.com/en/3.2/topics/i18n/
+# https://docs.djangoproject.com/en/stable/topics/i18n/
 
 LANGUAGE_CODE = "en-us"
 
@@ -175,6 +175,6 @@
 # [END staticurl]
 
 # Default primary key field type
-# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
+# https://docs.djangoproject.com/en/stable/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

appengine/flexible/django_cloudsql/requirements.txt

@@ -1,6 +1,7 @@
-Django==4.2.7
+Django==5.0; python_version >= "3.10"
+Django==4.2.8; python_version < "3.10"
 gunicorn==20.1.0
-psycopg2-binary==2.9.6
+psycopg2-binary==2.9.9
 django-environ==0.10.0
 google-cloud-secret-manager==2.16.1
 django-storages[google]==1.13.2

appengine/flexible/hello_world_django/project_name/settings.py

@@ -18,10 +18,10 @@
 Generated by 'django-admin startproject' using Django 1.8.4.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.8/topics/settings/
+https://docs.djangoproject.com/en/stable/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.8/ref/settings/
+https://docs.djangoproject.com/en/stable/ref/settings/
 """
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -31,7 +31,7 @@
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/stable/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = "qgw!j*bpxo7g&o1ux-(2ph818ojfj(3c#-#*_8r^8&hq5jg$3@"
@@ -86,7 +86,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
+# https://docs.djangoproject.com/en/stable/ref/settings/#databases
 
 DATABASES = {
  "default": {
@@ -97,7 +97,7 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.8/topics/i18n/
+# https://docs.djangoproject.com/en/stable/topics/i18n/
 
 LANGUAGE_CODE = "en-us"
 
@@ -111,6 +111,6 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.8/howto/static-files/
+# https://docs.djangoproject.com/en/stable/howto/static-files/
 
 STATIC_URL = "/static/"

appengine/flexible/hello_world_django/project_name/urls.py

@@ -15,7 +15,7 @@
 """project_name URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
- https://docs.djangoproject.com/en/1.8/topics/http/urls/
+ https://docs.djangoproject.com/en/stable/topics/http/urls/
 Examples:
 Function views
  1. Add an import: from my_app import views

appengine/flexible/hello_world_django/project_name/wsgi.py

@@ -18,7 +18,7 @@
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/stable/howto/deployment/wsgi/
 """
 
 import os

appengine/flexible/hello_world_django/requirements.txt

@@ -1,2 +1,4 @@
-Django==4.2.7
+Django==5.0; python_version >= "3.10"
+Django==4.2.8; python_version >= "3.8" and python_version < "3.10"
+Django==3.2.23; python_version < "3.8"
 gunicorn==20.1.0

appengine/flexible_python37_and_earlier/django_cloudsql/README.md

@@ -7,7 +7,7 @@
 
 This repository is an example of how to run a [Django](https://www.djangoproject.com/) 
 app on Google App Engine Flexible Environment. It uses the 
-[Writing your first Django app](https://docs.djangoproject.com/en/3.2/intro/tutorial01/) as the 
+[Writing your first Django app](https://docs.djangoproject.com/en/stable/intro/tutorial01/) as the 
 example app to deploy.
 
 

appengine/flexible_python37_and_earlier/django_cloudsql/mysite/settings.py

@@ -150,7 +150,7 @@
 ]
 
 # Internationalization
-# https://docs.djangoproject.com/en/3.2/topics/i18n/
+# https://docs.djangoproject.com/en/stable/topics/i18n/
 
 LANGUAGE_CODE = "en-us"
 
@@ -175,6 +175,6 @@
 # [END staticurl]
 
 # Default primary key field type
-# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
+# https://docs.djangoproject.com/en/stable/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

appengine/flexible_python37_and_earlier/django_cloudsql/requirements.txt

@@ -1,6 +1,8 @@
-Django==4.2.7
+Django==5.0; python_version >= "3.10"
+Django==4.2.8; python_version >= "3.8" and python_version < "3.10"
+Django==3.2.23; python_version < "3.8"
 gunicorn==20.1.0
-psycopg2-binary==2.9.6
+psycopg2-binary==2.9.9
 django-environ==0.10.0
 google-cloud-secret-manager==2.16.1
 django-storages[google]==1.13.2