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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Trung Dong Huynh 2016-11-24 09:42:58 +00:00
commit b39919d5aa
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cookiecutter.json
View File

@ -19,7 +19,7 @@
"use_heroku": "n", "use_heroku": "n",
"use_elasticbeanstalk_experimental": "n", "use_elasticbeanstalk_experimental": "n",
"use_compressor": "n", "use_compressor": "n",
"postgresql_version": ["9.5", "9.4", "9.3", "9.2"], "postgresql_version": ["9.6", "9.5", "9.4", "9.3", "9.2"],
"js_task_runner": ["Gulp", "Grunt", "None"], "js_task_runner": ["Gulp", "Grunt", "None"],
"use_lets_encrypt": "n", "use_lets_encrypt": "n",
"open_source_license": ["MIT", "BSD", "GPLv3", "Apache Software License 2.0", "Not open source"] "open_source_license": ["MIT", "BSD", "GPLv3", "Apache Software License 2.0", "Not open source"]

2
requirements.txt
View File

@ -7,5 +7,5 @@ binaryornot==0.4.0
pytest==3.0.4 pytest==3.0.4
pep8==1.7.0 pep8==1.7.0
pyflakes==1.3.0 pyflakes==1.3.0
tox==2.4.1 tox==2.5.0
pytest-cookies==0.2.0 pytest-cookies==0.2.0

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

@ -28,7 +28,7 @@ Pillow==3.4.2
# For user registration, either via email or social # For user registration, either via email or social
# Well-built with regular release cycles! # Well-built with regular release cycles!
django-allauth==0.28.0 django-allauth==0.29.0
{% if cookiecutter.windows == 'y' -%} {% if cookiecutter.windows == 'y' -%}
# On Windows, you must download/install psycopg2 manually # On Windows, you must download/install psycopg2 manually

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

@ -2,7 +2,7 @@
-r base.txt -r base.txt
coverage==4.2 coverage==4.2
django-coverage-plugin==1.3.1 django-coverage-plugin==1.3.1
Sphinx==1.4.8 Sphinx==1.4.9
django-extensions==1.7.4 django-extensions==1.7.4
Werkzeug==0.11.11 Werkzeug==0.11.11
django-test-plus==1.0.16 django-test-plus==1.0.16