Merge pull request gorakhargosh#368 from danilobellini/tox

Add a tox.ini that doesn't depend on setup.py test

.travis.yml

@@ -6,13 +6,27 @@ python:
   - 3.2
   - 3.3
   - 3.4
+  - 3.5
+  - nightly
   - pypy
+  - pypy3
+
+before_install:
+  - SED_GET_PY='s/[^0-9]//g;s/.//3g;2s/.*/py/;1!G;h;$!d;s/y.2./y/;s/y.3./y3/'
+  - PY=$(python -V 2>&1 | sed "$SED_GET_PY")
+  - test $PY == 32 && TOX='virtualenv<14 tox' || TOX=tox
+  - export TOXENV=py$PY
 
 install:
-  - python setup.py install
+  - pip install $TOX
+  - tox --notest
 
 script:
-  - python setup.py test
+  - tox
 
 notifications:
     email: false
+
+matrix:
+    allow_failures:
+      - python: nightly

tox.ini

@@ -1,5 +1,14 @@
 [tox]
-envlist = py26,py27,py34,pypy
+envlist = py{36,35,34,33,32,27,26,py3,py}
 
 [testenv]
-commands = python setup.py test
+deps = pytest-cov
+       pytest-timeout
+       py26: unittest2
+       py32: coverage<4
+       py32: pytest<3
+commands = py.test {posargs}
+
+[pytest]
+addopts = --cov=watchdog
+          --cov-report=term-missing