Merge pull request #81 from yarikoptic/bfs

Account for @eval_results move, add CHANGELOG.md to source distribution
datalad · Mar 22, 2023 · 9fb1282 · 9fb1282
2 parents 3784897 + a911679
commit 9fb1282
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include CONTRIBUTORS LICENSE versioneer.py
+include CHANGELOG.md CONTRIBUTORS LICENSE versioneer.py Gruntfile.js
 graft _datalad_buildsupport
 graft datalad_deprecated
 graft docs

diff --git a/datalad_deprecated/annotate_paths.py b/datalad_deprecated/annotate_paths.py
@@ -27,7 +27,7 @@
 from os.path import sep as dirsep
 
 from datalad.interface.base import Interface
-from datalad.interface.utils import eval_results
+from datalad.interface.base import eval_results
 from datalad.interface.base import build_doc
 from datalad.interface.results import get_status_dict
 from datalad.support.constraints import EnsureStr

diff --git a/datalad_deprecated/diff.py b/datalad_deprecated/diff.py
@@ -27,7 +27,7 @@
 from datalad_deprecated.annotate_paths import AnnotatePaths
 from datalad_deprecated.annotate_paths import annotated2content_by_ds
 from datalad.interface.base import Interface
-from datalad.interface.utils import eval_results
+from datalad.interface.base import eval_results
 from datalad.interface.base import build_doc
 from datalad.support.constraints import EnsureNone
 from datalad.support.constraints import EnsureStr

diff --git a/datalad_deprecated/metadata/extract_metadata.py b/datalad_deprecated/metadata/extract_metadata.py
@@ -16,7 +16,7 @@
 from datalad.interface.base import Interface
 from datalad.interface.base import build_doc
 from datalad.interface.results import get_status_dict
-from datalad.interface.utils import eval_results
+from datalad.interface.base import eval_results
 from datalad.distribution.dataset import datasetmethod
 from datalad.distribution.dataset import EnsureDataset
 from datalad.distribution.dataset import require_dataset

diff --git a/datalad_deprecated/metadata/search.py b/datalad_deprecated/metadata/search.py
@@ -37,7 +37,7 @@
     Interface,
     build_doc,
 )
-from datalad.interface.utils import eval_results
+from datalad.interface.base import eval_results
 from datalad.support.constraints import (
     EnsureInt,
     EnsureNone,

diff --git a/datalad_deprecated/publish.py b/datalad_deprecated/publish.py
@@ -24,7 +24,7 @@
     Interface,
     build_doc,
 )
-from datalad.interface.utils import eval_results
+from datalad.interface.base import eval_results
 from datalad.interface.results import get_status_dict
 from datalad.interface.common_opts import annex_copy_opts, recursion_flag, \
     recursion_limit, git_opts, annex_opts, jobs_opt

diff --git a/setup.cfg b/setup.cfg
@@ -14,7 +14,7 @@ classifiers =
 [options]
 python_requires = >= 3.7
 install_requires =
-    datalad >= 0.15.0
+    datalad >= 0.18.0
     jsmin
     whoosh
     PyYAML
@@ -25,7 +25,6 @@ install_requires =
 
 test_requires =
     coverage
-    datalad >= 0.17.0
     pytest
     pytest-cov
 packages = find_namespace: