From 5b50473ae2054de6d57985bcc69ded1f99d5c518 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Tue, 24 Sep 2019 11:53:19 -0400 Subject: [PATCH 1/2] TEST: Pin pytest < 5.1.3 --- nipype/info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/info.py b/nipype/info.py index 257031c38f..3f68b5fc17 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -176,7 +176,7 @@ def get_nipype_gitversion(): 'codecov', 'coverage<5', 'mock', - 'pytest', + 'pytest <5.1.3', 'pytest-cov', 'pytest-env', ] From 1081a41c2f17c5f960be15a4abc53cc00ea933c4 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Tue, 24 Sep 2019 12:16:36 -0400 Subject: [PATCH 2/2] PIN: Require pytest >= 4.4.0 so pytest-xdist does not upgrade --- nipype/info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/info.py b/nipype/info.py index 3f68b5fc17..16b8415b3c 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -176,7 +176,7 @@ def get_nipype_gitversion(): 'codecov', 'coverage<5', 'mock', - 'pytest <5.1.3', + 'pytest >=4.4.0,<5.1.3', 'pytest-cov', 'pytest-env', ]