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

requirements.txt

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

{{cookiecutter.project_slug}}/pytest.ini

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

{{cookiecutter.project_slug}}/requirements/local.txt

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

{{cookiecutter.project_slug}}/requirements/production.txt

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