From 9c7cb3fdb234a6711802716ecd7bdfe614728d38 Mon Sep 17 00:00:00 2001
From: Benjamin Poldrack <benjaminpoldrack@gmail.com>
Date: Tue, 16 Apr 2019 10:07:45 +0200
Subject: [PATCH 1/3] Remove outdated dependence on datalad-revolution

---
 datalad_hirni/commands/dicom2spec.py                      | 7 ++-----
 datalad_hirni/resources/procedures/setup_hirni_dataset.py | 4 ++--
 setup.py                                                  | 1 -
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/datalad_hirni/commands/dicom2spec.py b/datalad_hirni/commands/dicom2spec.py
index 3fa0df70..30e3aa50 100644
--- a/datalad_hirni/commands/dicom2spec.py
+++ b/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.api import rev_save
 from datalad.distribution.dataset import EnsureDataset
 from datalad.distribution.dataset import datasetmethod
 from datalad.distribution.dataset import require_dataset
@@ -346,10 +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,
-                                  path=[spec, '.gitattributes'],
+        for r in dataset.rev_save(path=[spec, '.gitattributes'],
                                   to_git=True,
                                   message="[HIRNI] Added study specification "
                                           "snippet for %s" %
diff --git a/datalad_hirni/resources/procedures/setup_hirni_dataset.py b/datalad_hirni/resources/procedures/setup_hirni_dataset.py
index 10202fbd..1b2c7a3b 100644
--- a/datalad_hirni/resources/procedures/setup_hirni_dataset.py
+++ b/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
diff --git a/setup.py b/setup.py
index 5a02aa80..e8d7d590 100755
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,6 @@
         'datalad-neuroimaging',
         'datalad-container',
         'datalad-webapp',
-        'datalad-revolution'
     ],
     extras_require={
         'devel-docs': [

From bda3b6130cc430cff285119e4da072df14129500 Mon Sep 17 00:00:00 2001
From: Benjamin Poldrack <benjaminpoldrack@gmail.com>
Date: Tue, 16 Apr 2019 11:39:02 +0200
Subject: [PATCH 2/3] test for spec4anything as well

---
 datalad_hirni/tests/test_register.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/datalad_hirni/tests/test_register.py b/datalad_hirni/tests/test_register.py
index 28715f78..1fe48e56 100644
--- a/datalad_hirni/tests/test_register.py
+++ b/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')
 

From 664d5ed55b6ba4b82ce610745404c50b40faaa88 Mon Sep 17 00:00:00 2001
From: Benjamin Poldrack <benjaminpoldrack@gmail.com>
Date: Tue, 16 Apr 2019 12:24:53 +0200
Subject: [PATCH 3/3] Don't import bound method rev_save for now. Somehow that
 import failed on Travis

---
 datalad_hirni/commands/dicom2spec.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/datalad_hirni/commands/dicom2spec.py b/datalad_hirni/commands/dicom2spec.py
index 30e3aa50..899568a3 100644
--- a/datalad_hirni/commands/dicom2spec.py
+++ b/datalad_hirni/commands/dicom2spec.py
@@ -6,7 +6,7 @@
 import os.path as op
 
 from datalad.coreapi import metadata
-from datalad.api import rev_save
+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,7 +346,8 @@ def __call__(path=None, spec=None, dataset=None, subject=None,
                                          {'annex.largefiles': 'nothing'})],
                                        '.gitattributes')
 
-        for r in dataset.rev_save(path=[spec, '.gitattributes'],
+        for r in RevSave.__call__(dataset=dataset,
+                                  path=[spec, '.gitattributes'],
                                   to_git=True,
                                   message="[HIRNI] Added study specification "
                                           "snippet for %s" %