Merge pull request nipy#2280 from mgxd/fix/pytest

fix: testing for non-developer installation

Author: satra

conftest.py renamed to 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

pytest.ini renamed to nipype/pytest.ini

@@ -100,15 +100,17 @@ def main():
         pjoin('testing', 'data', 'dicomdir', '*'),
         pjoin('testing', 'data', 'bedpostxout', '*'),
         pjoin('testing', 'data', 'tbss_dir', '*'),
-        pjoin('testing', 'data', 'brukerdir', '*'),
-        pjoin('testing', 'data', 'brukerdir', 'pdata', '*'),
+        pjoin('testing', 'data', 'brukerdir', 'fid'),
         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