updates tox/travis config

Author: saxix

.travis.yml

@@ -11,9 +11,7 @@ python:
 
 install:
   - pip install .
-  - pip install tox pytest>=2.8.2
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then travis_retry pip install 'django<1.5'; fi
-  - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then travis_retry pip install 'django>=1.6'; fi
+  - pip install tox
   - "TOX_ENV=${TRAVIS_PYTHON_VERSION/[0-9].[0-9]/py${TRAVIS_PYTHON_VERSION/.}}"
 
 

README.rst

@@ -1,10 +1,22 @@
 pytest-echo
 ===========
 
-(https://pypip.in/v/pytest-echo/badge.png)[`target: https://crate.io/packages/pytest-echo/`]
+.. image:: https://badge.fury.io/py/pytest-echo.svg
+   :target: http://badge.fury.io/py/pytest-echo
+   :alt: PyPI package
 
-.. image:: https://pypip.in/d/pytest-echo/badge.png
-   :target: https://crate.io/packages/pytest-echo/
+.. image:: https://travis-ci.org/saxix/pytest-echo.svg?branch=master
+   :target: https://travis-ci.org/saxix/pytest-echo
+   :alt: Travis CI build status (Linux)
+
+.. image:: https://codecov.io/github/saxix/pytest-echo/coverage.svg?branch=master
+   :target: https://codecov.io/github/saxix/pytest-echo?branch=master
+   :alt: Code Coverage
+
+
+.. image:: https://readthedocs.org/projects/pytest-echo/badge/?version=latest
+   :target: https://readthedocs.org/projects/pytest-echo/?badge=latest
+   :alt: Documentation Status
 
 
 Print environment variables, package version and generic attributes,
@@ -127,6 +139,8 @@ Links
 +--------------------+-------------------------------------------------+
 | Issue tracker:     |https://github.com/saxix/pytest-echo/issues?sort |
 +--------------------+-------------------------------------------------+
+| CI:                |https://travis-ci.org/saxix/pytest-echo          |
++--------------------+-------------------------------------------------+
 | Download:          |http://pypi.python.org/pypi/pytest-echo/         |
 +--------------------+-------------------------------------------------+
 | Documentation:     |https://pytest-echo.readthedocs.org/en/latest/   |

tox.ini

@@ -3,7 +3,8 @@ envlist=py27,py33,py34,py35,py36,pypy
 
 [testenv]
 deps =
-;       py27: pytest>=3.3.2
+    py{27,33}: django<2
+    py{34,35,36}: django
     py{33,34}: pytest<3
     py{33,34}: py<1.5