From 5519745598b6ba3d7d33466e92438ddf106c6abd Mon Sep 17 00:00:00 2001
From: Shay Palachy <shaypal5@gmail.com>
Date: Thu, 20 Apr 2017 11:55:27 +0300
Subject: [PATCH] travis fixes

---
 .travis.yml |  7 ++++---
 setup.py    | 10 ++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f6de007..e57f24c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,10 @@ before_install:
   # coverage submission packages
   - pip install codecov
 install:
-  - python setup.py test
-script: nosetests --cover-erase --with-coverage --cover-package=cachier -d
-# --ignore-files="tests_perf\.py" -coveralls
+  # Coveralls 4.0 doesn't support Python 3.2
+  - if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then travis_retry pip install repoze; fi
+  - pip install ".[test]"
+script: pytest --cov=pcachier
 # submit coverage
 after_success:
   # - coveralls
diff --git a/setup.py b/setup.py
index 3c52359..f1ed58c 100644
--- a/setup.py
+++ b/setup.py
@@ -14,10 +14,14 @@ except ImportError:
 
 import versioneer
 
+
+TEST_REQUIRES = ['pytest', 'coverage', 'pytest-cov']
+
 README_RST = ''
 with open('README.rst') as f:
     README_RST = f.read()
 
+
 setup(
     name='cachier',
     version=versioneer.get_version(),
@@ -33,8 +37,10 @@ setup(
         'pymongo',
         'watchdog'
     ],
-    setup_requires=['nose', 'coverage'],
-    test_suite='nose.collector',
+    extras_require={
+        'test': TEST_REQUIRES
+    },
+    setup_requires=TEST_REQUIRES,
     platforms=['linux', 'osx'],
     keywords=['cache', 'persistence', 'mongo', 'memoization', 'decorator'],
     classifiers=[