diff --git a/.travis.yml b/.travis.yml index 4f35e5b4..befcff2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ env: script: - flake8 -- py.test --cov -v --tb=native +- pytest --cov -v --tb=native - coverage report -m after_success: diff --git a/requirements-dev.txt b/requirements-dev.txt index 3a386fe1..2fdd7590 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,27 +2,24 @@ # Testing # ------------------------------------------------- -# Fix for travis CI tests failing -# Ref: https://github.com/FactoryBoy/factory_boy/issues/334#issuecomment-267696136 -fake-factory==0.7.4 -factory-boy==2.7.0 +factory-boy==2.11.1 flake8==2.4.1 -pytest-django==2.9.1 -pytest-cov==2.2.1 -pytest-flakes==1.0.0 +pytest-django==3.4.8 +pytest-flakes==2.0.0 +pytest-cov==2.6.1 -coverage==4.1 +coverage==4.5.3 # Documentation # -------------------------------------------------- -mkdocs==0.15.3 +mkdocs==1.0.4 bumpversion==0.5.3 # Debugging # -------------------------------------------------- -ipdb==0.9.0 +ipdb==0.12 # Patch for html5lib - issue #520 -html5lib<0.99999999 -bleach<2.0.0 +html5lib==1.0.1 +bleach==3.1.0 diff --git a/requirements.txt b/requirements.txt index aee6dfb1..a81dc30b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ hashids==1.1.0 # Django Model Helpers # ------------------------------------------------- django-uuid-upload-path==1.0.0 -Pillow==2.9.0 +Pillow==5.4.1 # Auth # ------------------------------------------------- diff --git a/setup.cfg b/setup.cfg index 7d167bb9..1e03a4af 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,7 +7,7 @@ tag = True [bumpversion:file:README.md] -[pytest] +[tool:pytest] DJANGO_SETTINGS_MODULE = settings.test_settings addopts = --reuse-db norecursedirs = .tox .git */migrations/* */static/* docs venv @@ -18,7 +18,7 @@ exclude = .tox,.git,*/migrations/*,*/static/*,docs,venv [coverage:run] source = junction/ -omit = +omit = *tests* *commands* *migrations*