Merge branch 'master' into pyup-update-tox-3.4.0-to-3.5.2

This commit is contained in:
Bruno Alla 2018-10-10 18:15:58 +01:00 committed by GitHub
commit db2e5c8464
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View File

@ -9,5 +9,5 @@ flake8==3.5.0
# Testing
# ------------------------------------------------------------------------------
tox==3.5.2
pytest==3.8.1
pytest==3.8.2
pytest-cookies==0.3.0

View File

@ -21,7 +21,7 @@ flower==0.9.2 # https://github.com/mher/flower
django==2.0.9 # 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.37.1 # https://github.com/pennersr/django-allauth
django-allauth==0.38.0 # 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

View File

@ -12,7 +12,7 @@ psycopg2-binary==2.7.5 # https://github.com/psycopg/psycopg2
# Testing
# ------------------------------------------------------------------------------
mypy==0.630 # https://github.com/python/mypy
pytest==3.8.1 # https://github.com/pytest-dev/pytest
pytest==3.8.2 # https://github.com/pytest-dev/pytest
pytest-sugar==0.9.1 # https://github.com/Frozenball/pytest-sugar
# Code quality

View File

@ -2,7 +2,7 @@
-r ./base.txt
gunicorn==19.8.1 # https://github.com/benoitc/gunicorn
gunicorn==19.9.0 # https://github.com/benoitc/gunicorn
psycopg2==2.7.4 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
{%- if cookiecutter.use_whitenoise == 'n' %}
Collectfast==0.6.2 # https://github.com/antonagestam/collectfast