Clean up tox, travis

numberoverzero · Apr 6, 2015 · 0f552ac · 0f552ac
1 parent f9fbedb
commit 0f552ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,4 +7,4 @@ env:
 install: pip install tox coveralls
 script: tox -e $TOXENV
 after_success:
-  - coveralls --rcfile=setup.cfg
+  - coveralls
diff --git a/setup.cfg b/setup.cfg
diff --git a/tox.ini b/tox.ini
@@ -1,20 +1,11 @@
 [tox]
-envlist = py32, py33, py34
+envlist = py32,py33,py34
 
 [testenv]
 deps = pytest
-       pytest-cov
        flake8
+       coverage>=4.0a1
 commands =
-    py.test --cov={envsitepackagesdir}/pyservice --cov-report=term-missing --cov-config={toxinidir}/setup.cfg tests
     flake8 pyservice tests examples
-
-[testenv:cov]
-deps =
-    pytest
-    coverage>=4.0a1
-    flake8
-commands =
     coverage run --branch --source=pyservice -m py.test
     coverage report -m
-    flake8 pyservice tests examples