From 9a452673327119f09dc957845e636d703183b227 Mon Sep 17 00:00:00 2001 From: Clemens Brunner Date: Fri, 13 Mar 2020 16:53:00 +0100 Subject: [PATCH] Don't use pytest 5.4 --- .travis.yml | 2 +- environment.yml | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1dd9abf9e5c..e71455c96e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,7 @@ before_install: fi; fi # Always install these via pip so we get the latest possible versions (testing bugfixes) - - pip install --upgrade pytest!=5.4.0 pytest-sugar pytest-cov pytest-mock pytest-timeout codecov + - pip install --upgrade "pytest<5.4" pytest-sugar pytest-cov pytest-mock pytest-timeout codecov - if [ "${DEPS}" != "minimal" ]; then pip install nitime; fi diff --git a/environment.yml b/environment.yml index 46eb5129aff..2663395ad93 100644 --- a/environment.yml +++ b/environment.yml @@ -17,7 +17,7 @@ dependencies: - pillow - statsmodels - jupyter -- pytest!=5.4.0 +- pytest<5.4 - pytest-cov - pytest-mock - pytest-timeout diff --git a/requirements.txt b/requirements.txt index a2fb13e80db..9e1d0308764 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pandas numexpr python-picard statsmodels -pytest!=4.6.0,!=5.4.0 +pytest!=4.6.0,<5.4 pytest-cov pytest-faulthandler pytest-mock