update tox, coveragerc, and travis

AlexAndBear · Feb 28, 2017 · 94f1804 · 94f1804
1 parent 6b4f4f7
commit 94f1804
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,2 +1,4 @@
 [run]
-omit=sqlalchemy_jsonapi/tests/*
+omit=sqlalchemy_jsonapi/tests/*, .tox/*, sqlalchemy_jsonapi/unittests/*
+[report]
+show_missing = True
diff --git a/.travis.yml b/.travis.yml
@@ -6,4 +6,6 @@ python:
 install:
   - "pip install ."
   - "pip install -r requirements.txt"
-script: py.test
+script:
+  - "py.test /sqlalchemy_jsonapi/tests/"
+  - "nosetests /sqlalchemy_jsonapi/unittests/"
diff --git a/tox.ini b/tox.ini
@@ -4,9 +4,11 @@ envlist = py27,py3,dandruff
 [testenv]
 use_develop=True
 deps=-r{toxinidir}/requirements.txt
-commands=py.test
+commands=
+    py.test {toxinidir}/sqlalchemy_jsonapi/tests/
+    nosetests --with-coverage --cover-package=sqlalchemy_jsonapi {toxinidir}/sqlalchemy_jsonapi/unittests/
 
 [testenv:dandruff]
 deps=-r{toxinidir}/requirements.txt
      flake8
-commands=flake8 {toxinidir}/sqlalchemy_jsonapi
+commands=flake8 {toxinidir}/sqlalchemy_jsonapi