Merge branch 'main' of github.com:GoogleCloudPlatform/python-docs-samples into testing-isolation

Author: davidcavazos

.github/CODEOWNERS

@@ -35,7 +35,7 @@
 /privateca/**/*                        @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 /recaptcha_enterprise/**/*             @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 /recaptcha_enterprise/demosite/**/*    @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/recaptcha-customer-obsession-reviewers @GoogleCloudPlatform/python-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
-/secretmanager/**/*                    @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
+/secretmanager/**/*                    @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers @GoogleCloudPlatform/cloud-secrets-team
 /securitycenter/**/*                   @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers @GoogleCloudPlatform/gcp-security-command-center
 /service_extensions/**/*               @GoogleCloudPlatform/service-extensions-samples-reviewers @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers
 /vmwareengine/**/*                     @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers @GoogleCloudPlatform/cloud-samples-reviewers

appengine/flexible/django_cloudsql/mysite/settings.py

@@ -158,7 +158,6 @@
 
 USE_I18N = True
 
-USE_L10N = True
 
 USE_TZ = True
 
@@ -168,8 +167,14 @@
 # Define static storage via django-storages[google]
 GS_BUCKET_NAME = env("GS_BUCKET_NAME")
 STATIC_URL = "/static/"
-DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
-STATICFILES_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
+STORAGES = {
+    "default": {
+        "BACKEND": "storages.backends.gcloud.GoogleCloudStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "storages.backends.gcloud.GoogleCloudStorage",
+    },
+}
 GS_DEFAULT_ACL = "publicRead"
 # [END gaeflex_py_django_static_config]
 # [END staticurl]

appengine/flexible/django_cloudsql/polls/urls.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 urlpatterns = [
-    re_path(r"^$", views.index, name="index"),
+    path("", views.index, name="index"),
 ]

appengine/flexible/django_cloudsql/requirements.txt

@@ -1,5 +1,5 @@
-Django==5.0.4; python_version >= "3.10"
-Django==4.2.13; python_version < "3.10"
+Django==5.1; python_version >= "3.10"
+Django==4.2.15; python_version >= "3.8" and python_version < "3.10"
 gunicorn==22.0.0
 psycopg2-binary==2.9.9
 django-environ==0.11.2

appengine/flexible/hello_world_django/project_name/urls.py

@@ -12,28 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""project_name URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/stable/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
-Including another URLconf
-    1. Add an import:  from blog import urls as blog_urls
-    2. Add a URL to urlpatterns:  url(r'^blog/', include(blog_urls))
-"""
-from django.conf.urls import include, url
 from django.contrib import admin
+from django.urls import include, path
 
 import helloworld.views
 
 
 urlpatterns = [
-    url(r"^admin/", include(admin.site.urls)),
-    url(r"^$", helloworld.views.index),
+    path("admin/", include(admin.site.urls)),
+    path("", helloworld.views.index),
 ]

appengine/flexible/hello_world_django/requirements.txt

@@ -1,4 +1,4 @@
-Django==5.0.4; python_version >= "3.10"
-Django==4.2.13; python_version >= "3.8" and python_version < "3.10"
+Django==5.1; python_version >= "3.10"
+Django==4.2.15; python_version >= "3.8" and python_version < "3.10"
 Django==3.2.25; python_version < "3.8"
 gunicorn==22.0.0

appengine/flexible_python37_and_earlier/django_cloudsql/polls/urls.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 urlpatterns = [
-    re_path(r"^$", views.index, name="index"),
+    path("", views.index, name="index"),
 ]

appengine/flexible_python37_and_earlier/django_cloudsql/requirements.txt

@@ -1,5 +1,5 @@
-Django==5.0.4; python_version >= "3.10"
-Django==4.2.13; python_version >= "3.8" and python_version < "3.10"
+Django==5.1; python_version >= "3.10"
+Django==4.2.15; python_version >= "3.8" and python_version < "3.10"
 Django==3.2.25; python_version < "3.8"
 gunicorn==22.0.0
 psycopg2-binary==2.9.9

appengine/flexible_python37_and_earlier/hello_world_django/project_name/urls.py

@@ -12,28 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""project_name URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/stable/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
-Including another URLconf
-    1. Add an import:  from blog import urls as blog_urls
-    2. Add a URL to urlpatterns:  url(r'^blog/', include(blog_urls))
-"""
-from django.conf.urls import include, url
 from django.contrib import admin
+from django.urls import include, path
 
 import helloworld.views
 
 
 urlpatterns = [
-    url(r"^admin/", include(admin.site.urls)),
-    url(r"^$", helloworld.views.index),
+    path("admin/", include(admin.site.urls)),
+    path("", helloworld.views.index),
 ]

appengine/flexible_python37_and_earlier/hello_world_django/requirements.txt

@@ -1,5 +1,4 @@
-Django==5.0.4; python_version >= "3.10"
-Django==5.0.3; python_version >= "3.10"
-Django==4.2.13; python_version >= "3.8" and python_version < "3.10"
+Django==5.1; python_version >= "3.10"
+Django==4.2.15; python_version >= "3.8" and python_version < "3.10"
 Django==3.2.25; python_version < "3.8"
 gunicorn==22.0.0