Merge pull request #129 from datalad/fix-metadata

Fix metadata import and dependency on datalad-deprecated
datalad · Oct 28, 2022 · d7c65ad · d7c65ad
2 parents 8a49940 + d654447
commit d7c65ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/datalad_crawler/pipelines/tests/test_openfmri.py b/datalad_crawler/pipelines/tests/test_openfmri.py
@@ -400,13 +400,13 @@ def hexsha(l):
 
     try:
         # this is the new way
-        from datalad.metadata.metadata import get_ds_aggregate_db_locations
+        from datalad_deprecated.metadata.metadata import get_ds_aggregate_db_locations
         ds = Dataset('.')
         dbloc, objbase = get_ds_aggregate_db_locations(ds)
         dbloc = op.relpath(dbloc, start=ds.path)
     except ImportError:
         # this stopped working in early 2019 versions of datalad
-        from datalad.metadata.metadata import agginfo_relpath
+        from datalad_deprecated.metadata.metadata import agginfo_relpath
         dbloc = agginfo_relpath
 
     target_files = {

diff --git a/setup.py b/setup.py
@@ -47,7 +47,7 @@ def findsome(subdir, extensions):
     ],
     'tests': [
         'datalad>=0.17.0',
-        'datalad-deprecated',
+        'datalad-deprecated>=0.2.6',
         'pytest>=7.0',
         'pytest-cov',
         'mock',