adjust tox and travis configurations

Author: pipermerriam

.travis.yml

@@ -12,18 +12,23 @@ env:
   - TOX_ENV=py34
   - TOX_ENV=py35
   global:
-    secure: cKbIgpTJ1yjKLBxpCEiT6IH7NShDWZUE+BvnrAfc+ujCsR6LyLJcKxFQmKnWryJCqg7fp82Ep2bF2oDKzanAROar2xDY1SFGbai42seYMaFCw53YPGJ6u3VNCcfT0rN9BWgE7el/m4fjcD6CRsZYKArNNJbMX8csRt3uXXCFLso=
+    - COVERAGE_APPEND="--append"
+    - secure: cKbIgpTJ1yjKLBxpCEiT6IH7NShDWZUE+BvnrAfc+ujCsR6LyLJcKxFQmKnWryJCqg7fp82Ep2bF2oDKzanAROar2xDY1SFGbai42seYMaFCw53YPGJ6u3VNCcfT0rN9BWgE7el/m4fjcD6CRsZYKArNNJbMX8csRt3uXXCFLso=
 install:
-  - "travis_retry pip install setuptools --upgrade"
-  - "travis_retry pip install tox"
+  - travis_retry pip install setuptools --upgrade
+  - travis_retry pip install tox
+  - travis_retry pip install coverage
 script:
-- coverage run --source ethereum -m py.test --ignore ethereum/tests/test_vm.py --ignore ethereum/tests/test_state.py
-- coverage run --append --source ethereum -m py.test ethereum/tests/test_vm.py
-- coverage run --append --source ethereum -m py.test ethereum/tests/test_state.py
+  - if [ -d ".tox/$TOX_ENV/" ]; then cd ".tox/$TOX_ENV" && coverage erase"; fi;
+  - tox -e $TOX_ENV --ignore ethereum/tests/test_vm.py --ignore ethereum/tests/test_state.py
+  - tox -e $TOX_ENV ethereum/tests/test_vm.py
+  - tox -e $TOX_ENV ethereum/tests/test_state.py
+  - cd .tox/$TOX_ENV && coverage report --show-missing
 script:
   - tox -e $TOX_ENV
 after_success:
-- coveralls
+  - travis_retry pip install coveralls
+  - cd .tox/$TOX_ENV && coveralls
 after_script:
   - cat .tox/$TOX_ENV/log/*.log
 notifications:

tox.ini

@@ -6,10 +6,7 @@ envlist =
 
 [testenv]
 commands=
-    coverage run --source ethereum -m py.test --ignore ethereum/tests/test_vm.py --ignore ethereum/tests/test_state.py
-    coverage run --append --source ethereum -m py.test ethereum/tests/test_vm.py
-    coverage run --append --source ethereum -m py.test ethereum/tests/test_state.py
-    coverage report --show-missing
+    coverage run {env:COVERAGE_APPEND:} --source ethereum -m py.test {posargs}
 deps =
     coverage
     -r{toxinidir}/dev_requirements.txt