Use plain tox env

ninezerozeronine · May 20, 2019 · a1e114e · a1e114e
1 parent 0cf95a4
commit a1e114e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,4 +9,4 @@ install:
 - pip install coveralls
 
 script:
-  - tox -e travis
+  - tox
diff --git a/tox.ini b/tox.ini
@@ -3,6 +3,18 @@ envlist = py27
 
 [testenv]
 
+deps = 
+    pytest
+    coverage
+    coveralls
+
+commands =
+    coverage run --source=eight_bit_computer -m pytest
+    coverage report
+    coveralls
+
+passenv = TRAVIS TRAVIS_*
+
 [testenv:test]
 deps = 
     pytest
@@ -18,7 +30,9 @@ deps =
 
 commands =
     coverage erase
-    pytest --cov={envsitepackagesdir}/eight_bit_computer --cov-report=term --cov-report=html --basetemp={envtmpdir}
+    coverage run --source=eight_bit_computer -m pytest
+    coverage report
+    # pytest --cov={envsitepackagesdir}/eight_bit_computer --cov-report=term --cov-report=html --basetemp={envtmpdir}
 
 [testenv:travis]
 deps = 
@@ -30,6 +44,3 @@ commands =
     pytest --cov={envsitepackagesdir}/eight_bit_computer --cov-report=term --basetemp={envtmpdir}
     coveralls
 
-passenv =
-    TRAVIS
-    TRAVIS_*