Skip to content

Commit

Permalink
MNT: Account for a number of deprecations in core
Browse files Browse the repository at this point in the history
this reduces the number of deprecation warnings when running the
test suite
  • Loading branch information
adswa committed Sep 16, 2024
1 parent 8ed8cca commit 8138373
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion datalad_container/containers_add.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def __call__(name, url=None, dataset=None, call_fmt=None, image=None,
# XXX: check=False is used to avoid dropping the image. It
# should use drop=False if remove() gets such an option (see
# DataLad's gh-2673).
for r in ds.remove(image, save=False, check=False,
for r in ds.remove(image, reckless='availability',
return_type="generator"):
yield r

Expand Down
4 changes: 2 additions & 2 deletions datalad_container/tests/test_containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def test_container_files(ds_path=None, local_file=None, url=None):
# non-default location:
ds.config.add("datalad.containers.location",
value=op.join(".datalad", "test-environments"),
where='dataset')
scope='branch')
ds.save(message="Configure container mountpoint", **common_kwargs)

# no containers yet:
Expand Down Expand Up @@ -278,7 +278,7 @@ def test_container_from_subdataset(ds_path=None, src_subds_path=None, local_file
# not installed subdataset doesn't pose an issue:
sub2 = ds.create("sub2", **common_kwargs)
assert_result_count(ds.subdatasets(**common_kwargs), 2, type="dataset")
ds.uninstall("sub2", check=False, **common_kwargs)
ds.drop("sub2", reckless='availability', what='datasets', **common_kwargs)
from datalad.tests.utils_pytest import assert_false
assert_false(sub2.is_installed())

Expand Down

0 comments on commit 8138373

Please sign in to comment.