From: Daniel Greenfeld <pydanny@gmail.com>
Date: Sat, 17 May 2014 23:32:10 +0000 (-0700)
Subject: Get travis in order
X-Git-Tag: 0.1.2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5db3dfa6ede243ee4b20f869f89ceae0956e61f3;p=cached-property.git

Get travis in order
---

diff --git a/.travis.yml b/.travis.yml
index 7dd5cf4..f96c7ce 100644
--- 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 c19afd5..4dec135 100644
--- 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