mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-07-16 02:52:25 +03:00
Update Django from 5.0 to 5.1 (#5740)
This commit is contained in:
parent
b4f95514aa
commit
7d8dabb813
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -81,7 +81,7 @@ jobs:
|
||||||
ports:
|
ports:
|
||||||
- 6379:6379
|
- 6379:6379
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:12
|
image: postgres:13
|
||||||
ports:
|
ports:
|
||||||
- 5432:5432
|
- 5432:5432
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -19,7 +19,7 @@ production-ready Django projects quickly.
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- For Django 5.0
|
- For Django 5.1
|
||||||
- Works with Python 3.12
|
- Works with Python 3.12
|
||||||
- Renders Django projects with 100% starting test coverage
|
- Renders Django projects with 100% starting test coverage
|
||||||
- Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
|
- Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
|
||||||
|
@ -51,7 +51,7 @@ _These features can be enabled during initial project setup._
|
||||||
## Constraints
|
## Constraints
|
||||||
|
|
||||||
- Only maintained 3rd party libraries are used.
|
- Only maintained 3rd party libraries are used.
|
||||||
- Uses PostgreSQL everywhere: 12 - 16 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available).
|
- Uses PostgreSQL everywhere: 13 - 16 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available).
|
||||||
- Environment variables for configuration (This won't work with Apache/mod_wsgi).
|
- Environment variables for configuration (This won't work with Apache/mod_wsgi).
|
||||||
|
|
||||||
## Support this Project!
|
## Support this Project!
|
||||||
|
@ -133,8 +133,7 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
|
||||||
2 - 15
|
2 - 15
|
||||||
3 - 14
|
3 - 14
|
||||||
4 - 13
|
4 - 13
|
||||||
5 - 12
|
Choose from 1, 2, 3, 4 [1]: 1
|
||||||
Choose from 1, 2, 3, 4, 5 [1]: 1
|
|
||||||
Select cloud_provider:
|
Select cloud_provider:
|
||||||
1 - AWS
|
1 - AWS
|
||||||
2 - GCP
|
2 - GCP
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
"windows": "n",
|
"windows": "n",
|
||||||
"editor": ["None", "PyCharm", "VS Code"],
|
"editor": ["None", "PyCharm", "VS Code"],
|
||||||
"use_docker": "n",
|
"use_docker": "n",
|
||||||
"postgresql_version": ["16", "15", "14", "13", "12"],
|
"postgresql_version": ["16", "15", "14", "13"],
|
||||||
"cloud_provider": ["AWS", "GCP", "Azure", "None"],
|
"cloud_provider": ["AWS", "GCP", "Azure", "None"],
|
||||||
"mail_service": [
|
"mail_service": [
|
||||||
"Mailgun",
|
"Mailgun",
|
||||||
|
|
|
@ -70,7 +70,6 @@ postgresql_version:
|
||||||
2. 15
|
2. 15
|
||||||
3. 14
|
3. 14
|
||||||
4. 13
|
4. 13
|
||||||
5. 12
|
|
||||||
|
|
||||||
cloud_provider:
|
cloud_provider:
|
||||||
Select a cloud provider for static & media files. The choices are:
|
Select a cloud provider for static & media files. The choices are:
|
||||||
|
|
|
@ -63,7 +63,6 @@ SUPPORTED_COMBINATIONS = [
|
||||||
{"postgresql_version": "15"},
|
{"postgresql_version": "15"},
|
||||||
{"postgresql_version": "14"},
|
{"postgresql_version": "14"},
|
||||||
{"postgresql_version": "13"},
|
{"postgresql_version": "13"},
|
||||||
{"postgresql_version": "12"},
|
|
||||||
{"cloud_provider": "AWS", "use_whitenoise": "y"},
|
{"cloud_provider": "AWS", "use_whitenoise": "y"},
|
||||||
{"cloud_provider": "AWS", "use_whitenoise": "n"},
|
{"cloud_provider": "AWS", "use_whitenoise": "n"},
|
||||||
{"cloud_provider": "GCP", "use_whitenoise": "y"},
|
{"cloud_provider": "GCP", "use_whitenoise": "y"},
|
||||||
|
|
|
@ -42,7 +42,7 @@ urlpatterns += [
|
||||||
# API base url
|
# API base url
|
||||||
path("api/", include("config.api_router")),
|
path("api/", include("config.api_router")),
|
||||||
# DRF auth token
|
# DRF auth token
|
||||||
path("api/auth-token/", obtain_auth_token),
|
path("api/auth-token/", obtain_auth_token, name="obtain_auth_token"),
|
||||||
path("api/schema/", SpectacularAPIView.as_view(), name="api-schema"),
|
path("api/schema/", SpectacularAPIView.as_view(), name="api-schema"),
|
||||||
path(
|
path(
|
||||||
"api/docs/",
|
"api/docs/",
|
||||||
|
|
|
@ -29,7 +29,7 @@ uvicorn-worker==0.3.0 # https://github.com/Kludex/uvicorn-worker
|
||||||
|
|
||||||
# Django
|
# Django
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
django==5.0.13 # pyup: < 5.1 # https://www.djangoproject.com/
|
django==5.1.8 # pyup: < 5.2 # https://www.djangoproject.com/
|
||||||
django-environ==0.12.0 # https://github.com/joke2k/django-environ
|
django-environ==0.12.0 # https://github.com/joke2k/django-environ
|
||||||
django-model-utils==5.0.0 # https://github.com/jazzband/django-model-utils
|
django-model-utils==5.0.0 # https://github.com/jazzband/django-model-utils
|
||||||
django-allauth[mfa]==65.6.0 # https://github.com/pennersr/django-allauth
|
django-allauth[mfa]==65.6.0 # https://github.com/pennersr/django-allauth
|
||||||
|
|
|
@ -17,7 +17,7 @@ class UserAdminChangeForm(admin_forms.UserChangeForm):
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
|
|
||||||
class UserAdminCreationForm(admin_forms.UserCreationForm):
|
class UserAdminCreationForm(admin_forms.AdminUserCreationForm): # type: ignore[name-defined] # django-stubs is missing the class, thats why the error is thrown: typeddjango/django-stubs#2555
|
||||||
"""
|
"""
|
||||||
Form for User Creation in the Admin Area.
|
Form for User Creation in the Admin Area.
|
||||||
To change user signup, see UserSignupForm and UserSocialSignupForm.
|
To change user signup, see UserSignupForm and UserSocialSignupForm.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user