Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MNT: Account for a number of deprecations in core #268

Merged
merged 2 commits into from
Sep 16, 2024
Merged

MNT: Account for a number of deprecations in core #268

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8138373
MNT: Account for a number of deprecations in core
adswa Sep 16, 2024
9fa80bd
[release-action] Autogenerate changelog snippet for PR 268
Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datalad_container/containers_add.py
View file
Open in desktop
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
View file
Open in desktop
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')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently we have datalad > 0.18.0 and scope came in 0.16.0 . the other changes (drop and install) I think even before then so we should be good. Thank you @adswa !

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
Loading