Use pytest>=3.6.0

Hopefully prevents issue with Travis and timeout plugin compatibility

.travis.yml

@@ -13,7 +13,7 @@ os:
   - linux
 
 env:
-  - VIA=compile 
+  - VIA=compile
   - VIA=flake8
   #- VIA=pypi_nightly
 
@@ -22,15 +22,15 @@ install:
   - pip install flake8
 
 script:
-  - "pip install pytest pytest-timeout"
+  - "pip install pytest-timeout"
   - if [[ "${VIA}" == "compile" ]]; then python -m pytest --tb=native spacy; fi
-  - if [[ "${VIA}" == "flake8" ]]; then flake8 . --count --exclude=spacy/compat.py,spacy/lang --select=E901,E999,F821,F822,F823 --show-source --statistics; fi  
+  - if [[ "${VIA}" == "flake8" ]]; then flake8 . --count --exclude=spacy/compat.py,spacy/lang --select=E901,E999,F821,F822,F823 --show-source --statistics; fi
   - if [[ "${VIA}" == "pypi_nightly" ]]; then python -m pytest --tb=native --models --en `python -c "import os.path; import spacy; print(os.path.abspath(os.path.dirname(spacy.__file__)))"`; fi
   - if [[ "${VIA}" == "sdist" ]]; then python -m pytest --tb=native `python -c "import os.path; import spacy; print(os.path.abspath(os.path.dirname(spacy.__file__)))"`; fi
-  
+
 notifications:
   slack:
     secure: F8GvqnweSdzImuLL64TpfG0i5rYl89liyr9tmFVsHl4c0DNiDuGhZivUz0M1broS8svE3OPOllLfQbACG/4KxD890qfF9MoHzvRDlp7U+RtwMV/YAkYn8MGWjPIbRbX0HpGdY7O2Rc9Qy4Kk0T8ZgiqXYIqAz2Eva9/9BlSmsJQ=
   email: false
 
-cache: pip
+cache: pip

requirements.txt

@@ -10,5 +10,5 @@ ujson>=1.35
 dill>=0.2,<0.3
 regex==2017.4.5
 requests>=2.13.0,<3.0.0
-pytest>=3.0.6,<4.0.0
+pytest>=3.6.0,<4.0.0
 mock>=2.0.0,<3.0.0