From 38f8b6351eb6736bcf65012e376053e9e333b608 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Mon, 13 Nov 2017 13:29:28 -0500 Subject: [PATCH 1/3] fix: testing for non-developer installation --- conftest.py => nipype/conftest.py | 2 +- pytest.ini => nipype/pytest.ini | 0 setup.py | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) rename conftest.py => nipype/conftest.py (77%) rename pytest.ini => nipype/pytest.ini (100%) diff --git a/conftest.py b/nipype/conftest.py similarity index 77% rename from conftest.py rename to nipype/conftest.py index f2d52f5f85..27a3789ea4 100644 --- a/conftest.py +++ b/nipype/conftest.py @@ -8,5 +8,5 @@ def add_np(doctest_namespace): filepath = os.path.dirname(os.path.realpath(__file__)) - datadir = os.path.realpath(os.path.join(filepath, 'nipype/testing/data')) + datadir = os.path.realpath(os.path.join(filepath, 'testing/data')) doctest_namespace["datadir"] = datadir diff --git a/pytest.ini b/nipype/pytest.ini similarity index 100% rename from pytest.ini rename to nipype/pytest.ini diff --git a/setup.py b/setup.py index 331fa5905b..599c3ce60c 100755 --- a/setup.py +++ b/setup.py @@ -101,14 +101,16 @@ def main(): pjoin('testing', 'data', 'bedpostxout', '*'), pjoin('testing', 'data', 'tbss_dir', '*'), pjoin('testing', 'data', 'brukerdir', '*'), - pjoin('testing', 'data', 'brukerdir', 'pdata', '*'), pjoin('testing', 'data', 'brukerdir', 'pdata', '1', '*'), + pjoin('testing', 'data', 'ds005', '*') pjoin('workflows', 'data', '*'), pjoin('pipeline', 'engine', 'report_template.html'), pjoin('external', 'd3.js'), pjoin('interfaces', 'script_templates', '*'), pjoin('interfaces', 'tests', 'realign_json.json'), pjoin('interfaces', 'tests', 'use_resources'), + 'pytest.ini', + 'conftest.py', ] # Python 3: use a locals dictionary From 0f4a1900ff3ab1caf31da7a9f8a7f5977deafda7 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Mon, 13 Nov 2017 13:37:27 -0500 Subject: [PATCH 2/3] fix: missing comma --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 599c3ce60c..8260a846ee 100755 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ def main(): pjoin('testing', 'data', 'tbss_dir', '*'), pjoin('testing', 'data', 'brukerdir', '*'), pjoin('testing', 'data', 'brukerdir', 'pdata', '1', '*'), - pjoin('testing', 'data', 'ds005', '*') + pjoin('testing', 'data', 'ds005', '*'), pjoin('workflows', 'data', '*'), pjoin('pipeline', 'engine', 'report_template.html'), pjoin('external', 'd3.js'), From 4a6351bc028958db5ccde379e197fa0273ae7d3f Mon Sep 17 00:00:00 2001 From: Mathias Goncalves Date: Mon, 13 Nov 2017 15:13:05 -0500 Subject: [PATCH 3/3] fix: included testing data earlier setuptools did not like mixing directories and files --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8260a846ee..8bca901a4a 100755 --- a/setup.py +++ b/setup.py @@ -100,7 +100,7 @@ def main(): pjoin('testing', 'data', 'dicomdir', '*'), pjoin('testing', 'data', 'bedpostxout', '*'), pjoin('testing', 'data', 'tbss_dir', '*'), - pjoin('testing', 'data', 'brukerdir', '*'), + pjoin('testing', 'data', 'brukerdir', 'fid'), pjoin('testing', 'data', 'brukerdir', 'pdata', '1', '*'), pjoin('testing', 'data', 'ds005', '*'), pjoin('workflows', 'data', '*'),