Merge pull request #9885 from QuLogic/backport-9878

QuLogic · web-flow · commit b8e997fb7d51 · 2017-11-30T00:21:15.000-05:00
Backport 9878
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -95,7 +95,7 @@ install:
   - echo %PYTHON_VERSION% %TARGET_ARCH%
   - if %PYTHON_VERSION% == 2.7 conda install -q backports.functools_lru_cache
   # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
-  - pip install -q pytest "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout
+  - pip install -q "pytest!=3.3.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout
 
   # Let the install prefer the static builds of the libs
   - set LIBRARY_LIB=%CONDA_PREFIX%\Library\lib
diff --git a/.travis.yml b/.travis.yml
@@ -136,7 +136,7 @@ install:
 
     # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
     pip install $PRE \
-        pytest \
+        pytest!=3.3.0 \
         pytest-cov>=2.3.1 \
         pytest-faulthandler \
         pytest-rerunfailures \
