Pin pytest >=4 with pip in appveyor and python 3.5 (#2737)

dask · May 31, 2019 · 7c3b4d1 · 7c3b4d1
1 parent a8504d6
commit 7c3b4d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -3,4 +3,5 @@ Distributed
 
 A library for distributed computation.  See documentation_ for more details.
 
+
 .. _documentation: https://distributed.readthedocs.io/en/latest
diff --git a/continuous_integration/setup_conda_environment.cmd b/continuous_integration/setup_conda_environment.cmd
@@ -50,7 +50,7 @@ call activate %CONDA_ENV%
 %PIP_INSTALL% git+https://github.com/joblib/joblib.git --upgrade
 %PIP_INSTALL% git+https://github.com/dask/zict --upgrade
 
-%PIP_INSTALL% pytest-repeat pytest-timeout pytest-faulthandler sortedcollections pytest-asyncio
+%PIP_INSTALL% "pytest>=4" pytest-repeat pytest-timeout pytest-faulthandler sortedcollections pytest-asyncio
 
 @rem Display final environment (for reproducing)
 %CONDA% list

diff --git a/continuous_integration/travis/install.sh b/continuous_integration/travis/install.sh
@@ -59,7 +59,7 @@ conda install -q \
 conda install -c defaults -c conda-forge libunwind
 conda install --no-deps -c defaults -c numba -c conda-forge stacktrace
 
-pip install -q pytest-repeat pytest-faulthandler pytest-asyncio
+pip install -q "pytest>=4" pytest-repeat pytest-faulthandler pytest-asyncio
 
 pip install -q git+https://github.com/dask/dask.git --upgrade --no-deps
 pip install -q git+https://github.com/joblib/joblib.git --upgrade --no-deps