Uniformize unittest startup

* via tox, unchanged * via nosetests, no arguments required * via python ./setup.py, either test or nosetest work without extra arguments
jeanphix · Feb 15, 2017 · b77c54f · b77c54f
1 parent ce3953c
commit b77c54f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -4,4 +4,8 @@ build-dir  = docs/build
 all_files  = 1
 
 [upload_sphinx]
-upload-dir = docs/build/html
+upload-dir = docs/build/html
+
+[nosetests]
+verbosity = 2
+tests = tests/run.py
diff --git a/setup.py b/setup.py
@@ -21,6 +21,8 @@
     data_files=[('ghost', ['README.rst',])],
     packages=find_packages(),
     include_package_data=True,
+    tests_require=['Flask'],
+    test_suite='tests.run',
     zip_safe=False,
     platforms='any',
     classifiers=[

diff --git a/tests/requirements.txt b/tests/requirements.txt
diff --git a/tox.ini b/tox.ini
@@ -18,7 +18,6 @@ setenv =
 passenv = DISPLAY
 deps =
     pyside: PySide
-    Flask
     nose
 commands =
-    nosetests {posargs} {toxinidir}/tests/run.py
+    {envpython} ./setup.py nosetests {posargs}