diff --git a/.travis/install.sh b/.travis/install.sh index f1e36bb9c..f546d3d43 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -7,14 +7,13 @@ sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-tk\ python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick\ libharfbuzz-dev libfribidi-dev +pip install check-manifest pip install cffi -pip install nose # TODO remove +pip install coverage +pip install olefile pip install pytest pip install pytest-cov -pip install check-manifest -pip install olefile pip install pyroma -pip install coverage pip install test-image-results # docs only on Python 2.7 diff --git a/.travis/script.sh b/.travis/script.sh index 74c48ea18..a47307ca5 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -7,8 +7,7 @@ python setup.py clean CFLAGS="-coverage" python setup.py build_ext --inplace coverage run --append --include="PIL/*" selftest.py -# coverage run --append --include="PIL/*" -m nose -vx Tests/test_*.py TODO remove -py.test -v --cov PIL --cov-append --cov-report term Tests +python -m pytest -vx --cov PIL --cov-append --cov-report term Tests pushd /tmp/check-manifest && check-manifest --ignore ".coveragerc,.editorconfig,*.yml,*.yaml,tox.ini" && popd # Docs diff --git a/requirements.txt b/requirements.txt index 213f145ab..4cb3c0907 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,10 +11,10 @@ docutils jarn.viewdoc Jinja2 MarkupSafe -nose -nose-cov olefile pycodestyle +pytest +pytest-cov pyflakes Pygments pyroma