From 23a8e0e45f4e3ee207835f7dec615984d3f4cdf6 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 27 Jul 2018 10:17:50 -0400 Subject: [PATCH 1/3] DEP: Update pytest dependency --- nipype/info.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nipype/info.py b/nipype/info.py index 6b60da6603..93f7836f49 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -105,7 +105,7 @@ def get_nipype_gitversion(): SCIPY_MIN_VERSION = '0.14' TRAITS_MIN_VERSION = '4.6' DATEUTIL_MIN_VERSION = '2.2' -PYTEST_MIN_VERSION = '3.0' +PYTEST_MIN_VERSION = '3.4' FUTURE_MIN_VERSION = '0.16.0' SIMPLEJSON_MIN_VERSION = '3.8.0' PROV_VERSION = '1.5.0' diff --git a/requirements.txt b/requirements.txt index 5ef00ec98b..4eb7e99c76 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ prov==1.5.0 click>=6.6.0 funcsigs configparser -pytest>=3.0 +pytest>=3.4 pytest-xdist pytest-env mock From 37c727d52f2bcb46aa43b611667c826a1b328d43 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 27 Jul 2018 13:45:27 -0400 Subject: [PATCH 2/3] Revert "DEP: Update pytest dependency" This reverts commit 23a8e0e45f4e3ee207835f7dec615984d3f4cdf6. --- nipype/info.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nipype/info.py b/nipype/info.py index 93f7836f49..6b60da6603 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -105,7 +105,7 @@ def get_nipype_gitversion(): SCIPY_MIN_VERSION = '0.14' TRAITS_MIN_VERSION = '4.6' DATEUTIL_MIN_VERSION = '2.2' -PYTEST_MIN_VERSION = '3.4' +PYTEST_MIN_VERSION = '3.0' FUTURE_MIN_VERSION = '0.16.0' SIMPLEJSON_MIN_VERSION = '3.8.0' PROV_VERSION = '1.5.0' diff --git a/requirements.txt b/requirements.txt index 4eb7e99c76..5ef00ec98b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ prov==1.5.0 click>=6.6.0 funcsigs configparser -pytest>=3.4 +pytest>=3.0 pytest-xdist pytest-env mock From 0884e2738f2a25431b86b57ba5f3ae1d662fcb10 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 27 Jul 2018 13:46:56 -0400 Subject: [PATCH 3/3] CI: Install pytest>=3.4 in Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bc60cab99c..8cade051ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,7 @@ before_install: export FSLOUTPUTTYPE=NIFTI_GZ; fi; +- travis_retry pip install --upgrade pytest>=3.4 # Work around pip failure - travis_retry pip install -r requirements.txt - travis_retry pip install grabbit==0.1.2 - travis_retry git clone https://github.com/INCF/pybids.git ${HOME}/pybids &&