From 3720651085e3b3876b1d1828c3739821a02e7e5a Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Sat, 12 Jan 2019 14:50:45 -0500 Subject: [PATCH 1/2] Remove pytest from requirements.txt which duplicates requirements --- requirements.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1d1a4d1f9c..560a72ca38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,9 +11,6 @@ neurdflib click>=6.6.0 funcsigs configparser -pytest>=3.0 -pytest-xdist -pytest-env mock pydotplus pydot>=1.2.3 From 8a168d96c7fc8c57b81521e0ae8b2f0329d4d0db Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 14 Jan 2019 12:18:52 -0500 Subject: [PATCH 2/2] RF: move mock into tests_requires --- nipype/info.py | 2 +- requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nipype/info.py b/nipype/info.py index 5780b71e1d..db3d1d73a4 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -147,7 +147,6 @@ def get_nipype_gitversion(): 'neurdflib', 'click>=%s' % CLICK_MIN_VERSION, 'funcsigs', - 'mock', 'pydotplus', 'pydot>=%s' % PYDOT_MIN_VERSION, 'packaging', @@ -158,6 +157,7 @@ def get_nipype_gitversion(): REQUIRES.append('configparser') TESTS_REQUIRES = [ + 'mock', 'pytest>=%s' % PYTEST_MIN_VERSION, 'pytest-xdist', 'pytest-cov', diff --git a/requirements.txt b/requirements.txt index 560a72ca38..0d951f49c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,6 @@ neurdflib click>=6.6.0 funcsigs configparser -mock pydotplus pydot>=1.2.3 packaging