Merge branch 'master' into mypy

requirements.txt

@@ -9,5 +9,5 @@ flake8==3.5.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.2.1
-pytest==3.7.2
+pytest==3.7.3
 pytest-cookies==0.3.0

tests/test_docker.sh

@@ -18,7 +18,7 @@ cd my_awesome_project
 docker-compose -f local.yml run django mypy my_awesome_project
 
 # run the project's tests
-docker-compose -f local.yml run django python manage.py pytest
+docker-compose -f local.yml run django pytest
 
 # return non-zero status code if there are migrations that have not been created
 docker-compose -f local.yml run django python manage.py makemigrations --dry-run --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; }

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

@@ -4,7 +4,7 @@ Pillow==5.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}
-argon2-cffi==18.2.0  # https://github.com/hynek/argon2_cffi
+argon2-cffi==18.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.0  # https://github.com/evansd/whitenoise
 {%- endif %}
@@ -21,7 +21,7 @@ flower==0.9.2  # https://github.com/mher/flower
 django==2.0.8  # pyup: < 2.1  # https://www.djangoproject.com/
 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-allauth==0.36.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.37.1  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.7.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.2  # https://github.com/django-compressor/django-compressor

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

@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # https://github.com/pallets/werkzeug
 ipdb==0.11  # https://github.com/gotcha/ipdb
-Sphinx==1.7.6  # https://github.com/sphinx-doc/sphinx
+Sphinx==1.7.8  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
@@ -12,7 +12,7 @@ psycopg2-binary==2.7.5  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.620  # https://github.com/python/mypy
-pytest==3.7.2  # https://github.com/pytest-dev/pytest
+pytest==3.7.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.1  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
@@ -25,6 +25,6 @@ coverage==4.5.1  # https://github.com/nedbat/coveragepy
 factory-boy==2.11.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==1.9.1  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.1.0  # https://github.com/django-extensions/django-extensions
+django-extensions==2.1.2  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.5.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.4.1  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.4.2  # https://github.com/pytest-dev/pytest-django

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

@@ -14,4 +14,4 @@ raven==6.9.0  # https://github.com/getsentry/raven-python
 # Django
 # ------------------------------------------------------------------------------
 django-storages[boto3]==1.6.6  # https://github.com/jschneier/django-storages
-django-anymail[mailgun]==3.0  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==4.1  # https://github.com/anymail/django-anymail