Merge pull request #195 from marl/test-cov

fixing test environment configuration

.travis.yml

@@ -23,11 +23,10 @@ before_install:
 
 install:
     # install your own package into the environment
-    - pip install git+https://github.com/craffel/mir_eval
-    - pip install -e .[display]
+    - pip install -e .[display,tests]
 
 script:
-    - py.test
+    - pytest
 
 after_success:
     - coveralls

.travis_dependencies.sh

@@ -30,7 +30,7 @@ if [ ! -d "$src" ]; then
         export PATH="$src/bin:$PATH"
         conda_create 
         source activate $ENV_NAME
-        pip install python-coveralls pytest-cov pytest-faulthandler
+        pip install python-coveralls
         source deactivate
     popd
 else

setup.py

@@ -38,10 +38,11 @@
         'numpy>=1.8.0',
         'six',
         'decorator',
-        'mir_eval>=0.4',
+        'mir_eval>=0.5',
     ],
     extras_require={
-        'display': ['matplotlib>=1.5.0']
+        'display': ['matplotlib>=1.5.0'],
+        'tests': ['pytest', 'pytest-cov'],
     },
     scripts=['scripts/jams_to_lab.py']
 )