Merge remote-tracking branch 'upstream/master'

cookiecutter.json

@@ -19,7 +19,7 @@
     "use_heroku": "n",
     "use_elasticbeanstalk_experimental": "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"],
     "use_lets_encrypt": "n",
     "open_source_license": ["MIT", "BSD", "GPLv3", "Apache Software License 2.0", "Not open source"]

requirements.txt

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

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

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

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

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