Simplified coveralls integration.

circuits · Jan 21, 2017 · 331da4f · 331da4f
1 parent f2798d0
commit 331da4f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,16 +31,19 @@ matrix:
       env: TOXENV=pypy
       before_install: brew install pypy
     - python: 3.6
+      install: pip install -U flake8
       script: flake8
+      after_success:
     - python: 3.6
+      install: pip install -U isort
       script: isort -c --diff
+      after_success:
 
 install:
-  - pip install tox-travis
   - pip install -Ur requirements-test.txt
   - pip install -Ue .
 
-script: tox
+script: tox -- --cov=./circuits --no-cov-on-fail --cov-report=
 
 after_success: coveralls
 

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,5 +1,7 @@
-pytest
 coveralls
+pytest
 pytest-cov
 flake8
 isort
+tox
+tox-travis
diff --git a/setup.py b/setup.py
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-
-
 from glob import glob
 
 from setuptools import find_packages, setup
@@ -76,13 +74,11 @@ def read_file(filename):
         ]
     ),
     scripts=glob("bin/*"),
-    install_requires=[],
     entry_points={
         "console_scripts": [
             "circuits.web=circuits.web.main:main",
         ]
     },
-    test_suite="tests.main.main",
     zip_safe=True,
     use_scm_version={
         "write_to": "circuits/version.py",

diff --git a/tests/main.py b/tests/main.py
diff --git a/tox.ini b/tox.ini
@@ -11,7 +11,6 @@ skip_missing_interpreters = True
 commands=py.test {posargs}
 deps = 
     pytest
-    coveralls
     pytest-cov
 
 [testenv:docs]