cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-08-17 18:34:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cookiecutter/cookiecutter-django into cookicutter-master-2022.06.15

Browse Source
This commit is contained in:
Abdullah Adeel 2022-06-19 11:50:38 +05:00
commit 1ffe59dde3
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
<!-- GENERATOR_PLACEHOLDER --> <!-- GENERATOR_PLACEHOLDER -->
## 2022.06.15
### Updated
- Update django-environ to 0.9.0 ([#3751](https://github.com/cookiecutter/cookiecutter-django/pull/3751))
## 2022.06.13
### Updated
- Update cookiecutter to 2.1.1 ([#3727](https://github.com/cookiecutter/cookiecutter-django/pull/3727))
## 2022.06.11 ## 2022.06.11
### Updated ### Updated

2
requirements.txt
View File

@ -1,4 +1,4 @@
cookiecutter==1.7.3 cookiecutter==2.1.1
sh==1.14.2 sh==1.14.2
binaryornot==0.4.4 binaryornot==0.4.4

2
setup.py
View File

@ -5,7 +5,7 @@ except ImportError:
from distutils.core import setup from distutils.core import setup
# We use calendar versioning # We use calendar versioning
version = "2022.06.11" version = "2022.06.15"
with open("README.rst") as readme_file: with open("README.rst") as readme_file:
long_description = readme_file.read() long_description = readme_file.read()

12
tests/test_cookiecutter_generation.py
View File

@ -47,11 +47,11 @@ SUPPORTED_COMBINATIONS = [
{"use_pycharm": "n"}, {"use_pycharm": "n"},
{"use_docker": "y"}, {"use_docker": "y"},
{"use_docker": "n"}, {"use_docker": "n"},
{"database_engine": "postgresql", "database_version": "postgresql@14.1"}, {"database_engine": "postgresql", "database_version": "postgresql@14"},
{"database_engine": "postgresql", "database_version": "postgresql@13.5"}, {"database_engine": "postgresql", "database_version": "postgresql@13"},
{"database_engine": "postgresql", "database_version": "postgresql@12.9"}, {"database_engine": "postgresql", "database_version": "postgresql@12"},
{"database_engine": "postgresql", "database_version": "postgresql@11.14"}, {"database_engine": "postgresql", "database_version": "postgresql@11"},
{"database_engine": "postgresql", "database_version": "postgresql@10.1 9"}, {"database_engine": "postgresql", "database_version": "postgresql@10"},
{"database_engine": "mysql", "database_version": "mysql@8.0.28"}, {"database_engine": "mysql", "database_version": "mysql@8.0.28"},
{"database_engine": "mysql", "database_version": "mysql@8.0"}, {"database_engine": "mysql", "database_version": "mysql@8.0"},
{"database_engine": "mysql", "database_version": "mysql@5.7"}, {"database_engine": "mysql", "database_version": "mysql@5.7"},
@ -91,7 +91,7 @@ SUPPORTED_COMBINATIONS = [
{"use_drf": "y"}, {"use_drf": "y"},
{"use_drf": "n"}, {"use_drf": "n"},
{"frontend_pipeline": "None"}, {"frontend_pipeline": "None"},
{"frontend_pipeline": "django-compressor"}, {"frontend_pipeline": "Django Compressor"},
{"frontend_pipeline": "Gulp"}, {"frontend_pipeline": "Gulp"},
{"use_celery": "y"}, {"use_celery": "y"},
{"use_celery": "n"}, {"use_celery": "n"},

2
{{cookiecutter.project_slug}}/requirements/base.txt
View File

@ -30,7 +30,7 @@ uvicorn[standard]==0.17.6 # https://github.com/encode/uvicorn
# Django # Django
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
django==3.2.13 # pyup: < 4.0 # https://www.djangoproject.com/ django==3.2.13 # pyup: < 4.0 # https://www.djangoproject.com/
django-environ==0.8.1 # https://github.com/joke2k/django-environ django-environ==0.9.0 # https://github.com/joke2k/django-environ
django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils
django-allauth==0.51.0 # https://github.com/pennersr/django-allauth django-allauth==0.51.0 # https://github.com/pennersr/django-allauth
django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms