Merge branch 'issue120' into devel

2013-09-19 16:46:44 -04:00 · 2013-09-19 16:46:44 -04:00 · ecf61821c4
commit ecf61821c4
parent d51f9cb031 e6ffa0e271
2 changed files with 6 additions and 6 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -10,13 +10,10 @@ before_install:
  - sudo apt-get install -qq python3-numpy

 # command to install dependencies
-install:
-  - pip install . --use-mirrors
+install: "pip install -r travis-requirements.txt --use-mirrors"

 # command to run tests
-script: 
-  - "python -m unittest discover"
+script: "python -m unittest discover"

 notifications:
-  email:
-    - john.g.evans.ne@gmail.com
+  email: "john.g.evans.ne@gmail.com"
--- a/travis-requirements.txt
+++ b/travis-requirements.txt
@ -0,0 +1,3 @@
+numpy
+contextlib2>=0.4.0
+mock>=1.0.1