From 5db3dfa6ede243ee4b20f869f89ceae0956e61f3 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Sat, 17 May 2014 16:32:10 -0700 Subject: [PATCH] Get travis in order --- .travis.yml | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 -- 2.30.2