From 88431b1c0a09ce06c307a11daa3322fc9725bbe3 Mon Sep 17 00:00:00 2001 From: Peter Rowlands Date: Thu, 24 Aug 2023 15:49:40 +0900 Subject: [PATCH] update: preserve `def_path` for version-aware import update --- dvc/dependency/base.py | 3 --- dvc/testing/workspace_tests.py | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dvc/dependency/base.py b/dvc/dependency/base.py index cc94f610d..f4e5d3951 100644 --- a/dvc/dependency/base.py +++ b/dvc/dependency/base.py @@ -44,9 +44,6 @@ class Dependency(Output): if self.fs.version_aware: self.fs_path = self.fs.path.version_path(self.fs_path, rev) self.meta = self.get_meta() - self.def_path = self.fs.path.version_path( - self.def_path, self.meta.version_id - ) self.fs_path = self.fs.path.version_path(self.fs_path, self.meta.version_id) def download(self, to, jobs=None): diff --git a/dvc/testing/workspace_tests.py b/dvc/testing/workspace_tests.py index dfbe633bf..216c83ff1 100644 --- a/dvc/testing/workspace_tests.py +++ b/dvc/testing/workspace_tests.py @@ -95,6 +95,9 @@ class TestImportURLVersionAware: assert (tmp_dir / "file").read_text() == "file" assert dvc.status() == {} + orig_version_id = stage.deps[0].meta.version_id + orig_def_path = stage.deps[0].def_path + dvc.cache.local.clear() remove(tmp_dir / "file") dvc.pull() @@ -108,6 +111,10 @@ class TestImportURLVersionAware: assert (tmp_dir / "file").read_text() == "modified" assert dvc.status() == {} + stage = first(dvc.index.stages) + assert orig_version_id != stage.deps[0].meta.version_id + assert orig_def_path == stage.deps[0].def_path + dvc.cache.local.clear() remove(tmp_dir / "file") dvc.pull()