Merge pull request #47 from carljm/miscellaneous-suggested-improvements

Miscellaneous Tox, Coverage, and Travis improvements

.coveragerc

@@ -0,0 +1,4 @@
+[run]
+source = model_utils
+omit = model_utils/tests/*
+branch = 1

.travis.yml

@@ -15,7 +15,9 @@ install:
   - pip install coverage coveralls --use-mirrors
   - sh -c "if [ '$SOUTH' = '1' ]; then pip install South==0.7.6; fi"
 
-script: coverage run -a --branch --include="model_utils/*" --omit="model_utils/tests/*" setup.py test
+script:
+  - coverage run -a setup.py test
+  - coverage report
 
 matrix:
   include:

runtests.sh

@@ -2,4 +2,4 @@
 
 coverage erase
 tox
-coverage html --include=model_utils/* --omit=model_utils/tests/*
+coverage html

tox.ini

@@ -1,67 +1,85 @@
 [tox]
-envlist=py26-1.4,py26,py26-trunk,py27-1.4,py27,py27-trunk,py27-nosouth,py32-1.5-nosouth,py32-trunk-nosouth,py33-1.5-nosouth,py33-trunk-nosouth
+envlist =
+    py26-1.4, py26-1.5, py26-trunk,
+    py27-1.4, py27-1.5, py27-trunk, py27-1.4-nosouth,
+    py32-1.5-nosouth, py32-trunk-nosouth,
+    py33-1.5-nosouth, py33-trunk-nosouth
 
 [testenv]
-deps=
-  django==1.5.1
-  South==0.7.6
-  coverage==3.6
-commands=coverage run -a --branch setup.py test
+deps =
+    South == 0.7.6
+    coverage == 3.6
+commands = coverage run -a setup.py test
 
 [testenv:py26-1.4]
-basepython=python2.6
-deps=
-  django==1.4.5
-  South==0.7.6
-  coverage==3.6
+basepython = python2.6
+deps =
+    django == 1.4.5
+    South == 0.7.6
+    coverage == 3.6
+
+[testenv:py26-1.5]
+basepython = python2.6
+deps =
+    django == 1.5.1
+    South == 0.7.6
+    coverage == 3.6
 
 [testenv:py26-trunk]
-basepython=python2.6
-deps=
-  https://github.com/django/django/tarball/master
-  South==0.7.6
-  coverage==3.6
+basepython = python2.6
+deps =
+    https://github.com/django/django/tarball/master
+    South == 0.7.6
+    coverage == 3.6
 
 [testenv:py27-1.4]
-basepython=python2.7
-deps=
-  django==1.4.5
-  South==0.7.6
-  coverage==3.6
+basepython = python2.7
+deps =
+    django == 1.4.5
+    South == 0.7.6
+    coverage == 3.6
+
+[testenv:py27-1.5]
+basepython = python2.7
+deps =
+    django == 1.5.1
+    South == 0.7.6
+    coverage == 3.6
 
 [testenv:py27-trunk]
-basepython=python2.7
-deps=
-  https://github.com/django/django/tarball/master
-  South==0.7.6
-  coverage==3.6
+basepython = python2.7
+deps =
+    https://github.com/django/django/tarball/master
+    South == 0.7.6
+    coverage == 3.6
 
 [testenv:py32-1.5-nosouth]
-basepython=python3.2
-deps=
-  django==1.5.1
-  coverage==3.6
+basepython = python3.2
+deps =
+    django == 1.5.1
+    coverage == 3.6
 
 [testenv:py32-trunk-nosouth]
-basepython=python3.2
-deps=
-  https://github.com/django/django/tarball/master
-  coverage==3.6
+basepython = python3.2
+deps =
+    https://github.com/django/django/tarball/master
+    coverage == 3.6
 
 [testenv:py33-1.5-nosouth]
-basepython=python3.3
-deps=
-  django==1.5.1
-  coverage==3.6
+basepython = python3.3
+deps =
+    django == 1.5.1
+    coverage == 3.6
 
 [testenv:py33-trunk-nosouth]
-basepython=python3.3
-deps=
-  https://github.com/django/django/tarball/master
-  coverage==3.6
+basepython = python3.3
+deps =
+    https://github.com/django/django/tarball/master
+    coverage == 3.6
 
 
-[testenv:py27-nosouth]
-deps=
-  django==1.4.5
-  coverage==3.6
+[testenv:py27-1.5-nosouth]
+basepython = python2.7
+deps =
+    django == 1.4.5
+    coverage == 3.6