Merge pull request #94 from bpoldrack/rm-revolution

Remove outdated dependence on datalad-revolution

datalad_hirni/commands/dicom2spec.py

@@ -6,7 +6,7 @@
 import os.path as op
 
 from datalad.coreapi import metadata
-from datalad_revolution.revsave import RevSave
+from datalad.core.local.save import Save as RevSave
 from datalad.distribution.dataset import EnsureDataset
 from datalad.distribution.dataset import datasetmethod
 from datalad.distribution.dataset import require_dataset
@@ -346,9 +346,7 @@ def __call__(path=None, spec=None, dataset=None, subject=None,
                                          {'annex.largefiles': 'nothing'})],
                                        '.gitattributes')
 
-        from datalad_revolution.dataset import RevolutionDataset
-        rev_ds = RevolutionDataset(dataset.path)
-        for r in RevSave.__call__(dataset=rev_ds,
+        for r in RevSave.__call__(dataset=dataset,
                                   path=[spec, '.gitattributes'],
                                   to_git=True,
                                   message="[HIRNI] Added study specification "

datalad_hirni/resources/procedures/setup_hirni_dataset.py

@@ -4,10 +4,10 @@
 import sys
 import os.path as op
 import datalad.support.json_py as json_py
-from datalad_revolution.dataset import require_dataset
+from datalad.distribution.dataset import require_dataset
 
 # bound dataset methods
-import datalad_revolution.revsave
+from datalad.api import rev_save
 import datalad_hirni.commands.spec4anything
 import datalad.distribution.install
 import datalad.metadata.aggregate

datalad_hirni/tests/test_register.py

@@ -3,7 +3,8 @@
 
 def test_register():
     import datalad.api as da
-    assert hasattr(da, 'hirni_import_dcm')
+    assert hasattr(da, 'hirni_spec4anything')
     assert hasattr(da, 'hirni_dicom2spec')
+    assert hasattr(da, 'hirni_import_dcm')
     assert hasattr(da, 'hirni_spec2bids')
 

setup.py

@@ -48,7 +48,6 @@
         'datalad-neuroimaging',
         'datalad-container',
         'datalad-webapp',
-        'datalad-revolution'
     ],
     extras_require={
         'devel-docs': [