Get travis in order

diff --git a/.travis.yml b/.travis.yml
index 7dd5cf4af896e1b6aa0dcf44191ddfafdef69c45..f96c7ce0562f1381a8822e732a4ef83be4c40ffc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ python:
   - "pypy"
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-install: pip install -r requirements.txt
+install: pip install pytest
 
 # command to run tests, e.g. python setup.py test
-script: python setup.py test
\ No newline at end of file
+script: py.test
\ No newline at end of file

diff --git a/Makefile b/Makefile
index c19afd56caa32b4524559e8310cc1c2f651851f0..4dec135b85b6fea7d887f19a4e60e391b3a05d8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ lint:
        flake8 cached_property tests
 
 test:
-       py.test --cov cached_property
+       py.test cached_property.py
 
 test-all:
        tox