Merge branch 'master' into prep-for-django-storages-2.0

This commit is contained in:
Wan Liuyang 2018-09-09 19:52:33 +08:00 committed by GitHub
commit a0af652358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

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

View File

@ -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.4 # https://github.com/pytest-dev/pytest
pytest==3.8.0 # https://github.com/pytest-dev/pytest
pytest-sugar==0.9.1 # https://github.com/Frozenball/pytest-sugar
# Code quality
@ -26,5 +26,5 @@ factory-boy==2.11.1 # https://github.com/FactoryBoy/factory_boy
django-debug-toolbar==1.10 # https://github.com/jazzband/django-debug-toolbar
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
django-coverage-plugin==1.6.0 # https://github.com/nedbat/django_coverage_plugin
pytest-django==3.4.2 # https://github.com/pytest-dev/pytest-django

View File

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