mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-08-24 05:44:52 +03:00
Merge 447fcdbacb
into 3206c207de
This commit is contained in:
commit
2d892380ac
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:13
|
image: postgres:14
|
||||||
ports:
|
ports:
|
||||||
- 5432:5432
|
- 5432:5432
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -19,7 +19,7 @@ production-ready Django projects quickly.
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- For Django 5.1
|
- For Django 5.2
|
||||||
- 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: 13 - 17 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available).
|
- Uses PostgreSQL everywhere: 14 - 17 ([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 - 16
|
2 - 16
|
||||||
3 - 15
|
3 - 15
|
||||||
4 - 14
|
4 - 14
|
||||||
5 - 13
|
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": ["17", "16", "15", "14", "13"],
|
"postgresql_version": ["17", "16", "15", "14"],
|
||||||
"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. 16
|
2. 16
|
||||||
3. 15
|
3. 15
|
||||||
4. 14
|
4. 14
|
||||||
5. 13
|
|
||||||
|
|
||||||
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:
|
||||||
|
|
|
@ -18,7 +18,7 @@ requires-python = ">=3.12,<3.13"
|
||||||
classifiers = [
|
classifiers = [
|
||||||
"Development Status :: 4 - Beta",
|
"Development Status :: 4 - Beta",
|
||||||
"Environment :: Console",
|
"Environment :: Console",
|
||||||
"Framework :: Django :: 5.0",
|
"Framework :: Django :: 5.2",
|
||||||
"Intended Audience :: Developers",
|
"Intended Audience :: Developers",
|
||||||
"License :: OSI Approved :: BSD License",
|
"License :: OSI Approved :: BSD License",
|
||||||
"Natural Language :: English",
|
"Natural Language :: English",
|
||||||
|
|
|
@ -63,7 +63,6 @@ SUPPORTED_COMBINATIONS = [
|
||||||
{"postgresql_version": "16"},
|
{"postgresql_version": "16"},
|
||||||
{"postgresql_version": "15"},
|
{"postgresql_version": "15"},
|
||||||
{"postgresql_version": "14"},
|
{"postgresql_version": "14"},
|
||||||
{"postgresql_version": "13"},
|
|
||||||
{"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"},
|
||||||
|
|
|
@ -32,7 +32,7 @@ repos:
|
||||||
rev: '1.25.0'
|
rev: '1.25.0'
|
||||||
hooks:
|
hooks:
|
||||||
- id: django-upgrade
|
- id: django-upgrade
|
||||||
args: ['--target-version', '5.0']
|
args: ['--target-version', '5.2']
|
||||||
|
|
||||||
# Run the Ruff linter.
|
# Run the Ruff linter.
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
|
|
|
@ -29,7 +29,7 @@ uvicorn-worker==0.3.0 # https://github.com/Kludex/uvicorn-worker
|
||||||
|
|
||||||
# Django
|
# Django
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
django==5.1.11 # pyup: < 5.2 # https://www.djangoproject.com/
|
django==5.2.5 # pyup: < 6.0 # 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.11.0 # https://github.com/pennersr/django-allauth
|
django-allauth[mfa]==65.11.0 # https://github.com/pennersr/django-allauth
|
||||||
|
|
Loading…
Reference in New Issue
Block a user