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

Merge branch 'master' into pyup-update-werkzeug-0.12.2-to-0.13

Browse Source
This commit is contained in:
Shupeyko Nikita 2017-12-13 15:38:31 +03:00 committed by GitHub
commit 8a1e170121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -4,7 +4,7 @@ sh==1.12.14
binaryornot==0.4.4 binaryornot==0.4.4
# Testing # Testing
pytest==3.2.5 pytest==3.3.1
pycodestyle==2.3.1 pycodestyle==2.3.1
pyflakes==1.6.0 pyflakes==1.6.0
tox==2.9.1 tox==2.9.1

3
{{cookiecutter.project_slug}}/pytest.ini
View File

@ -1,2 +1,5 @@
[pytest] [pytest]
DJANGO_SETTINGS_MODULE=config.settings.test DJANGO_SETTINGS_MODULE=config.settings.test
{% if cookiecutter.js_task_runner != 'None' %}
norecursedirs = node_modules
{% endif %}

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

@ -5,7 +5,7 @@ coverage==4.4.2
django-coverage-plugin==1.5.0 django-coverage-plugin==1.5.0
Sphinx==1.6.5 Sphinx==1.6.5
django-extensions==1.9.7 django-extensions==1.9.8
Werkzeug==0.13 Werkzeug==0.13
django-test-plus==1.0.20 django-test-plus==1.0.20
factory-boy==2.9.2 factory-boy==2.9.2

4
{{cookiecutter.project_slug}}/requirements/production.txt
View File

@ -16,7 +16,7 @@ gunicorn==19.7.1
# Static and Media Storage # Static and Media Storage
# ------------------------------------------------ # ------------------------------------------------
boto3==1.4.7 boto3==1.4.8
django-storages==1.6.5 django-storages==1.6.5
{% if cookiecutter.use_whitenoise != 'y' -%} {% if cookiecutter.use_whitenoise != 'y' -%}
Collectfast==0.5.2 Collectfast==0.5.2
@ -29,7 +29,7 @@ django-anymail==1.2
{% if cookiecutter.use_sentry_for_error_reporting == "y" -%} {% if cookiecutter.use_sentry_for_error_reporting == "y" -%}
# Raven is the Sentry client # Raven is the Sentry client
# -------------------------- # --------------------------
raven==6.3.0 raven==6.4.0
{%- endif %} {%- endif %}
{% if cookiecutter.use_opbeat == "y" -%} {% if cookiecutter.use_opbeat == "y" -%}