diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6efcef8f2..1fa399174 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: ports: - 6379:6379 postgres: - image: postgres:12 + image: postgres:13 ports: - 5432:5432 env: diff --git a/README.md b/README.md index a46f214b4..c58a94c14 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ production-ready Django projects quickly. ## Features -- For Django 5.0 +- For Django 5.1 - Works with Python 3.12 - Renders Django projects with 100% starting test coverage - Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5 @@ -51,7 +51,7 @@ _These features can be enabled during initial project setup._ ## Constraints - 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). ## Support this Project! diff --git a/cookiecutter.json b/cookiecutter.json index 86e44f368..99acae738 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -18,7 +18,7 @@ "windows": "n", "editor": ["None", "PyCharm", "VS Code"], "use_docker": "n", - "postgresql_version": ["16", "15", "14", "13", "12"], + "postgresql_version": ["16", "15", "14", "13"], "cloud_provider": ["AWS", "GCP", "Azure", "None"], "mail_service": [ "Mailgun", diff --git a/docs/1-getting-started/project-generation-options.rst b/docs/1-getting-started/project-generation-options.rst index 21059d3a2..cef89e3cb 100644 --- a/docs/1-getting-started/project-generation-options.rst +++ b/docs/1-getting-started/project-generation-options.rst @@ -70,7 +70,6 @@ postgresql_version: 2. 15 3. 14 4. 13 - 5. 12 cloud_provider: Select a cloud provider for static & media files. The choices are: diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 609e0d672..558eae9e3 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -63,7 +63,6 @@ SUPPORTED_COMBINATIONS = [ {"postgresql_version": "15"}, {"postgresql_version": "14"}, {"postgresql_version": "13"}, - {"postgresql_version": "12"}, {"cloud_provider": "AWS", "use_whitenoise": "y"}, {"cloud_provider": "AWS", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "use_whitenoise": "y"}, diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py index 8f9b5e426..c69358180 100644 --- a/{{cookiecutter.project_slug}}/config/urls.py +++ b/{{cookiecutter.project_slug}}/config/urls.py @@ -42,7 +42,7 @@ urlpatterns += [ # API base url path("api/", include("config.api_router")), # 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/docs/", diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index bdd9cc1e0..5da4cbc2d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn-worker==0.3.0 # https://github.com/Kludex/uvicorn-worker # Django # ------------------------------------------------------------------------------ -django==5.0.13 # pyup: < 5.1 # https://www.djangoproject.com/ +django==5.1.7 # https://www.djangoproject.com/ 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-allauth[mfa]==65.4.1 # https://github.com/pennersr/django-allauth diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index d568b70f8..170286967 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,15 +29,15 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ ruff==0.11.2 # https://github.com/astral-sh/ruff -coverage==7.7.1 # https://github.com/nedbat/coveragepy +coverage==7.6.12 # https://github.com/nedbat/coveragepy djlint==1.36.4 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.2.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ -factory-boy==3.3.2 # https://github.com/FactoryBoy/factory_boy +factory-boy==3.3.3 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==5.1.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==5.0.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.3 # https://github.com/django-extensions/django-extensions django-coverage-plugin==3.1.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.10.0 # https://github.com/pytest-dev/pytest-django diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py index 35a70101e..a53eac6bd 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py @@ -17,7 +17,7 @@ class UserAdminChangeForm(admin_forms.UserChangeForm): {%- endif %} -class UserAdminCreationForm(admin_forms.UserCreationForm): +class UserAdminCreationForm(admin_forms.AdminUserCreationForm): """ Form for User Creation in the Admin Area. To change user signup, see UserSignupForm and UserSocialSignupForm.