Merge remote-tracking branch 'upstream/master'

This commit is contained in:
ilikerobots 2020-07-17 15:34:17 +03:00
commit 71b24d8a7c
3 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ flake8-isort==3.0.1
# Testing # Testing
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
tox==3.16.1 tox==3.17.1
pytest==5.4.3 pytest==5.4.3
pytest-cookies==0.5.1 pytest-cookies==0.5.1
pytest-instafail==0.4.2 pytest-instafail==0.4.2

View File

@ -29,7 +29,7 @@ flake8==3.8.3 # https://github.com/PyCQA/flake8
flake8-isort==3.0.1 # https://github.com/gforcada/flake8-isort flake8-isort==3.0.1 # https://github.com/gforcada/flake8-isort
coverage==5.2 # https://github.com/nedbat/coveragepy coverage==5.2 # https://github.com/nedbat/coveragepy
black==19.10b0 # https://github.com/ambv/black black==19.10b0 # https://github.com/ambv/black
pylint-django==2.0.15 # https://github.com/PyCQA/pylint-django pylint-django==2.1.0 # https://github.com/PyCQA/pylint-django
{%- if cookiecutter.use_celery == 'y' %} {%- if cookiecutter.use_celery == 'y' %}
pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery
{%- endif %} {%- endif %}
@ -40,6 +40,6 @@ pre-commit==2.6.0 # https://github.com/pre-commit/pre-commit
factory-boy==2.12.0 # https://github.com/FactoryBoy/factory_boy factory-boy==2.12.0 # https://github.com/FactoryBoy/factory_boy
django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar
django-extensions==3.0.2 # https://github.com/django-extensions/django-extensions django-extensions==3.0.3 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin
pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django

View File

@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %} {%- endif %}
{%- if cookiecutter.use_sentry == "y" %} {%- if cookiecutter.use_sentry == "y" %}
sentry-sdk==0.16.0 # https://github.com/getsentry/sentry-python sentry-sdk==0.16.1 # https://github.com/getsentry/sentry-python
{%- endif %} {%- endif %}
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
hiredis==1.0.1 # https://github.com/redis/hiredis-py hiredis==1.0.1 # https://github.com/redis/hiredis-py