Skip to content

remove: remove dvc.yaml and dvc.lock if they are empty #4196

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

Merged
merged 5 commits into from
Jul 13, 2020
Merged

remove: remove dvc.yaml and dvc.lock if they are empty #4196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01bd7cd
remove: remove dvc.yaml, dvc.lock if they are empty
nik123 Jul 12, 2020
4a1885e
tests: remove: simplified dvc.yaml in test_remove_stage_removes_dvcfi…
nik123 Jul 12, 2020
bb0acbc
tests: remove: minor fixes
nik123 Jul 12, 2020
1fa368d
tests: remove: simplified test_remove_stage_removes_dvcfiles_if_no_st…
nik123 Jul 13, 2020
a512225
remove: independent removal of dvc.lock and dvc.yaml
nik123 Jul 13, 2020
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
11 changes: 9 additions & 2 deletions dvc/dvcfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,11 @@ def remove_stage(self, stage):

logger.debug("Removing '%s' from '%s'", stage.name, self.path)
del d["stages"][stage.name]
dump_yaml(self.path, d)

if d["stages"]:
dump_yaml(self.path, d)
else:
super().remove()


class Lockfile(FileMixin):
Expand Down Expand Up @@ -286,7 +290,10 @@ def remove_stage(self, stage):
logger.debug("Removing '%s' from '%s'", stage.name, self.path)
del d[stage.name]

dump_yaml(self.path, d)
if d:
dump_yaml(self.path, d)
else:
self.remove()


class Dvcfile:
Expand Down
17 changes: 17 additions & 0 deletions tests/func/test_dvcfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,23 @@ def test_remove_stage_preserves_comment(tmp_dir, dvc, run_copy):
)


def test_remove_stage_removes_dvcfiles_if_no_stages_left(
tmp_dir, dvc, run_copy
):
tmp_dir.gen("foo", "foo")
run_copy("foo", "bar", name="run_copy")

dvc_file = Dvcfile(dvc, PIPELINE_FILE)

assert dvc_file.exists()
assert (tmp_dir / PIPELINE_LOCK).exists()
assert (tmp_dir / "foo").exists()

dvc_file.remove_stage(dvc_file.stages["run_copy"])
assert not dvc_file.exists()
assert not (tmp_dir / PIPELINE_LOCK).exists()


def test_dvcfile_dump_preserves_meta(tmp_dir, dvc, run_copy):
tmp_dir.gen("foo", "foo")
stage = run_copy("foo", "bar", name="run_copy")
Expand Down