Fix tox and travisCI configuration

.travis.yml

@@ -4,15 +4,15 @@ python:
   - 2.7
   - 3.3
   - 3.4
-# - 3.5 (pylint currently fails with python 3.5)
+  - 3.5
   - pypy
 install:
   - pip install -r requirements.txt
   - pip install pytest>=2.7.3 --upgrade
   - pip install pylint
   - pip install coveralls
 script:
-  - if [[ $TRAVIS_PYTHON_VERSION != 2.6 ]]; then pylint rebulk; fi
+  - if [ $TRAVIS_PYTHON_VERSION != 2.6 ] && [ $TRAVIS_PYTHON_VERSION != 3.5 ]; then pylint rebulk; fi
   - coverage run --source=rebulk setup.py test
   - python setup.py build
 after_success:

dev-requirements.txt

@@ -1,4 +1,5 @@
 pytest>=2.7.3
+pytest-capturelog
 zest.releaser[recommended]
 pylint
 tox

tox.ini

@@ -3,11 +3,17 @@ envlist = py26,py27,py33,py34,py35,pypy
 
 [testenv:py26]
 commands =
+    {envbindir}/pip install -r dev-requirements.txt
+    {envpython} setup.py test
+
+[testenv:py35]
+commands =
+    {envbindir}/pip install -r dev-requirements.txt
     {envpython} setup.py test
 
 [testenv]
 commands =
-    {envbindir}/pip install pylint
+    {envbindir}/pip install -r dev-requirements.txt
     {envbindir}/pylint rebulk
     {envpython} setup.py test