Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Trung Dong Huynh 2017-01-20 10:51:00 +00:00
commit fa22d1c3b1
5 changed files with 8 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# These requirements prevented an upgrade to Django 1.10. # These requirements prevented an upgrade to Django 1.10.
django-coverage-plugin==1.3.1 django-coverage-plugin==1.4
django-autoslug==1.9.3 django-autoslug==1.9.3

View File

@ -21,7 +21,7 @@ django-braces==1.10.0
django-crispy-forms==1.6.1 django-crispy-forms==1.6.1
# Models # Models
django-model-utils==2.6 django-model-utils==2.6.1
# Images # Images
Pillow==4.0.0 Pillow==4.0.0

View File

@ -1,7 +1,9 @@
# Local development dependencies go here # Local development dependencies go here
-r base.txt -r base.txt
coverage==4.3.1
django-coverage-plugin==1.3.1 coverage==4.3.4
django-coverage-plugin==1.4
Sphinx==1.5.1 Sphinx==1.5.1
django-extensions==1.7.5 django-extensions==1.7.5
Werkzeug==0.11.15 Werkzeug==0.11.15

View File

@ -11,7 +11,7 @@ psycopg2==2.6.2
# WSGI Handler # WSGI Handler
# ------------------------------------------------ # ------------------------------------------------
gevent==1.2.0 gevent==1.2.1
gunicorn==19.6.0 gunicorn==19.6.0
# Static and Media Storage # Static and Media Storage

View File

@ -7,7 +7,7 @@
psycopg2==2.6.2 psycopg2==2.6.2
{%- endif %} {%- endif %}
coverage==4.3.1 coverage==4.3.4
flake8==3.2.1 # pyup: != 2.6.0 flake8==3.2.1 # pyup: != 2.6.0
django-test-plus==1.0.16 django-test-plus==1.0.16
factory-boy==2.8.1 factory-boy==2.8.1