cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-30 05:24:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2017 from pydanny/upgrade/django-2.1

Browse Source 
Upgrade to Django 2.1
This commit is contained in:
Bruno Alla 2019-05-08 12:57:59 +01:00 committed by GitHub
commit 17e00f0ccc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.rst
View File

@ -36,7 +36,7 @@ production-ready Django projects quickly.
Features Features
--------- ---------
* For Django 2.0 * For Django 2.1
* Works with Python 3.6 * Works with Python 3.6
* Renders Django projects with 100% starting test coverage * Renders Django projects with 100% starting test coverage
* Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available) * Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)
@ -89,7 +89,7 @@ Constraints
----------- -----------
* Only maintained 3rd party libraries are used. * Only maintained 3rd party libraries are used.
* Uses PostgreSQL everywhere (9.2+) * Uses PostgreSQL everywhere (9.4 - 10.5)
* 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!
@ -177,8 +177,7 @@ Answer the prompts with your own desired options_. For example::
6 - 9.6 6 - 9.6
7 - 9.5 7 - 9.5
8 - 9.4 8 - 9.4
9 - 9.3 Choose from 1, 2, 3, 4, 5, 6, 7, 8 [1]: 1
Choose from 1, 2, 3, 4 [1]: 1
Select js_task_runner: Select js_task_runner:
1 - None 1 - None
2 - Gulp 2 - Gulp

3
cookiecutter.json
View File

@ -25,8 +25,7 @@
"10.1", "10.1",
"9.6", "9.6",
"9.5", "9.5",
"9.4", "9.4"
"9.3"
], ],
"js_task_runner": [ "js_task_runner": [
"None", "None",

15
docs/project-generation-options.rst
View File

@ -49,13 +49,14 @@ use_docker:
postgresql_version: postgresql_version:
Select a PostgreSQL_ version to use. The choices are: Select a PostgreSQL_ version to use. The choices are:
1. 10.3 1. 10.5
2. 10.2 2. 10.4
3. 10.1 3. 10.3
4. 9.6 4. 10.2
5. 9.5 5. 10.1
6. 9.4 6. 9.6
7. 9.3 7. 9.5
8. 9.4
js_task_runner: js_task_runner:
Select a JavaScript task runner. The choices are: Select a JavaScript task runner. The choices are:

1
{{cookiecutter.project_slug}}/config/settings/base.py
View File

@ -109,7 +109,6 @@ PASSWORD_HASHERS = [
"django.contrib.auth.hashers.PBKDF2PasswordHasher", "django.contrib.auth.hashers.PBKDF2PasswordHasher",
"django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher", "django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher",
"django.contrib.auth.hashers.BCryptSHA256PasswordHasher", "django.contrib.auth.hashers.BCryptSHA256PasswordHasher",
"django.contrib.auth.hashers.BCryptPasswordHasher",
] ]
# https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators # https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [ AUTH_PASSWORD_VALIDATORS = [

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

@ -18,7 +18,7 @@ flower==0.9.3 # https://github.com/mher/flower
# Django # Django
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
django==2.0.13 # pyup: < 2.1 # https://www.djangoproject.com/ django==2.1.8 # pyup: < 2.2 # https://www.djangoproject.com/
django-environ==0.4.5 # https://github.com/joke2k/django-environ django-environ==0.4.5 # https://github.com/joke2k/django-environ
django-model-utils==3.1.2 # https://github.com/jazzband/django-model-utils django-model-utils==3.1.2 # https://github.com/jazzband/django-model-utils
django-allauth==0.39.1 # https://github.com/pennersr/django-allauth django-allauth==0.39.1 # https://github.com/pennersr/django-allauth