Fixes travis test invocation and updates tox to match

- Moves to py.test as gives better error messages
phildini · Jun 27, 2018 · 2c6dee6 · 2c6dee6
1 parent b15754f
commit 2c6dee6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,7 @@ install:
 # Command to run tests, e.g. python setup.py test
 script:
     - flake8 thanks
+    - pip list
     - python setup.py test
 
 
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -8,3 +8,4 @@ coverage==4.4.2
 Sphinx==1.6.5
 twine==1.9.1
 ddt
+pytest
diff --git a/setup.cfg b/setup.cfg
@@ -19,4 +19,4 @@ exclude = docs
 max-line-length = 120
 
 [aliases]
-
+test=pytest
diff --git a/setup.py b/setup.py
@@ -22,10 +22,11 @@
 ]
 
 setup_requirements = [
-    'nose'
+    "pytest-runner"
 ]
 
 test_requirements = [
+    "pytest",
     'ddt',
 ]
 
@@ -63,7 +64,6 @@
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
     ],
-    test_suite='nose.collector',
     tests_require=test_requirements,
     setup_requires=setup_requirements,
 )
diff --git a/tox.ini b/tox.ini
@@ -14,8 +14,9 @@ deps = flake8
 commands = flake8 thanks
 
 [testenv]
+whitelist_externals=
+    py.test
 setenv =
     PYTHONPATH = {toxinidir}
 
-commands = python setup.py nosetests
-
+commands = python setup.py test
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,4 @@ coverage==4.4.2 @@
     Sphinx==1.6.5
     twine==1.9.1
     ddt
+    pytest
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ exclude = docs
		max-line-length = 120

		[aliases]

		test=pytest