Merge 725b5c3 into 9715466

jpadilla · Jan 24, 2015 · 7fef8c3 · 7fef8c3
2 parents 9715466 + 725b5c3
commit 7fef8c3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,14 @@
 language: python
-python: 2.7
 sudo: false
 env:
-  - TOX_ENV=py26
-  - TOX_ENV=py27
-  - TOX_ENV=py32
-  - TOX_ENV=py33
+  - TOXENV=py26
+  - TOXENV=py27
+  - TOXENV=py32
+  - TOXENV=py33
+  - TOXENV=py34
 install:
   - pip install tox coveralls
 script:
-  - coverage erase
-  - tox -e $TOX_ENV
+  - tox
 after_success:
   - coveralls
diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,11 @@
 envlist = py26, py27, py32, py33, py34
 
 [testenv]
-commands = coverage run setup.py test
+commands = 
+    coverage erase
+    coverage run setup.py test
+    coverage report -m
 deps =
     cryptography
     unittest2
+    coverage