Merge pull request #4150 from ThomasWaldmann/unbreak-travis

unbreak 1.0-maint on travis, fixes #4123

.travis/install.sh

@@ -45,7 +45,7 @@ fi
 
 python -m virtualenv ~/.venv
 source ~/.venv/bin/activate
-pip install -r requirements.d/development.txt
+pip install -r requirements.d/development.lock.txt
 pip install codecov
 python setup.py --version
 pip install -e .[fuse]

requirements.d/development.lock.txt

@@ -0,0 +1,9 @@
+virtualenv==13.1.2
+setuptools-scm==3.1.0
+pluggy==0.6.0
+tox==3.1.3
+pytest==3.5.1
+pytest-xdist==1.24.0
+pytest-cov==2.6.0
+pytest-benchmark==3.1.1
+Cython==0.29

requirements.d/development.txt

@@ -2,8 +2,9 @@ setuptools
 setuptools_scm
 pip
 virtualenv<14.0
+pluggy<0.7
 tox<3.2.0
-pytest!=3.3.0
+pytest<3.6.0
 pytest-xdist
 pytest-cov
 pytest-benchmark

tox.ini

@@ -17,5 +17,5 @@ passenv = *
 
 [testenv:flake8]
 changedir =
-deps = flake8
+deps = flake8<3.6.0
 commands = flake8