update tests

dead-beef · Feb 25, 2018 · ae49170 · ae49170
1 parent 5658158
commit ae49170
Show file tree

Hide file tree

Showing 19 changed files with 1,603 additions and 1,538 deletions.
diff --git a/setup.py b/setup.py
@@ -1,11 +1,8 @@
 #!/usr/bin/env python3
 
 import os
-from unittest import TestLoader
 from setuptools import setup, find_packages
 
-def tests():
-    return TestLoader().discover('tests')
 
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 try:
@@ -39,12 +36,13 @@ def tests():
       entry_points={
           'console_scripts': ['markovchain=markovchain.cli:main'],
       },
-      test_suite='setup.tests',
       install_requires=['tqdm', 'ijson', 'custom_inherit'],
       extras_require={
           'image': ['pillow'],
           'dev': [
               'pillow',
+              'pytest',
+              'pytest-mock',
               'coverage',
               'sphinx',
               'sphinx_rtd_theme',

diff --git a/test b/test
@@ -5,7 +5,7 @@ if [ -d env ]; then
 fi
 
 if which coverage >/dev/null 2>&1; then
-    coverage run --include 'markovchain/*' setup.py test && coverage report -m
+    coverage run --include 'markovchain/*' -m pytest && coverage report -m
 else
-    ./setup.py test
+    pytest
 fi