Skip to content

Commit 38f8b63

Browse files
committed
fix: testing for non-developer installation
1 parent 68e8ef0 commit 38f8b63

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

conftest.py renamed to nipype/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ def add_np(doctest_namespace):
88

99

1010
filepath = os.path.dirname(os.path.realpath(__file__))
11-
datadir = os.path.realpath(os.path.join(filepath, 'nipype/testing/data'))
11+
datadir = os.path.realpath(os.path.join(filepath, 'testing/data'))
1212
doctest_namespace["datadir"] = datadir
File renamed without changes.

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,16 @@ def main():
101101
pjoin('testing', 'data', 'bedpostxout', '*'),
102102
pjoin('testing', 'data', 'tbss_dir', '*'),
103103
pjoin('testing', 'data', 'brukerdir', '*'),
104-
pjoin('testing', 'data', 'brukerdir', 'pdata', '*'),
105104
pjoin('testing', 'data', 'brukerdir', 'pdata', '1', '*'),
105+
pjoin('testing', 'data', 'ds005', '*')
106106
pjoin('workflows', 'data', '*'),
107107
pjoin('pipeline', 'engine', 'report_template.html'),
108108
pjoin('external', 'd3.js'),
109109
pjoin('interfaces', 'script_templates', '*'),
110110
pjoin('interfaces', 'tests', 'realign_json.json'),
111111
pjoin('interfaces', 'tests', 'use_resources'),
112+
'pytest.ini',
113+
'conftest.py',
112114
]
113115

114116
# Python 3: use a locals dictionary

0 commit comments

Comments
 (0)