Merge pull request #18 from greut/pytest

Replace nose with pytest.

Author: jcupitt

Diff for: .travis.yml

@@ -42,7 +42,6 @@ cache:
 language: python
 python:
   - "2.7"
-  - "3.2"
   - "3.3"
   - "3.4"
   - "3.5"
@@ -51,6 +50,10 @@ python:
   - "pypy"
   - "pypy3"
 
+matrix:
+  allow_failures:
+    - python: nightly
+
 install:
   - pip install tox tox-travis
 

Diff for: setup.cfg

@@ -1,2 +1,5 @@
+[aliases]
+test=pytest
+
 [bdist_wheel]
 universal=1

Diff for: setup.py

@@ -18,9 +18,14 @@
 with open(path.join(here, 'pyvips', 'version.py'), encoding='utf-8') as f:
     exec(f.read(), info)
 
+setup_deps = [
+    'pytest-runner'
+]
+
 test_deps = [
-    'nose',
-    'flake8'
+    'pytest',
+    'pytest-catchlog',
+    'pytest-flake8'
 ]
 
 extras = {
@@ -63,6 +68,7 @@
 
     install_requires=['cffi'],
 
+    setup_requires=setup_deps,
     tests_require=test_deps,
     extras_require=extras,
 

Diff for: tox.ini

@@ -10,14 +10,17 @@ envlist =
 python =
     3.6: doc
 
+[pytest]
+addopts=--verbose
+log_level=WARNING
+
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}
 
 commands =
-    tests: pip install -e .[test]
-    tests: nosetests --logging-level=WARNING
+    test: python setup.py test
     qa: pip install -e .[test]
-    qa: flake8
+    qa: pytest --flake8
     doc: pip install -e .[doc]
     doc: sphinx-build -n -b html doc doc/build/html