From 5310bcdcec70c637f15839791b5f5939ccea48cc Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Thu, 2 Feb 2023 04:18:18 +0200 Subject: [PATCH] deps: bump dvc-data to 0.37.3 (#8923) --- dvc/output.py | 10 ---------- dvc/repo/data.py | 2 +- dvc/repo/diff.py | 2 +- dvc/repo/index.py | 9 +++++++++ pyproject.toml | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dvc/output.py b/dvc/output.py index a382d8ef7..7a3393f3c 100644 --- a/dvc/output.py +++ b/dvc/output.py @@ -555,13 +555,6 @@ class Output: return workspace, key def get_entry(self) -> "DataIndexEntry": - from dvc.config import NoRemoteError - - try: - remote = self.repo.cloud.get_remote_odb(self.remote) - except NoRemoteError: - remote = None - if self.files and not self.obj: self.obj = self.get_obj() @@ -569,9 +562,6 @@ class Output: meta=self.meta, obj=self.obj, hash_info=self.hash_info, - odb=self.odb, - cache=self.odb, - remote=remote, ) if self.stage.is_import and not self.stage.is_repo_import: dep = self.stage.deps[0] diff --git a/dvc/repo/data.py b/dvc/repo/data.py index 2dbd40575..2fceb2cb7 100644 --- a/dvc/repo/data.py +++ b/dvc/repo/data.py @@ -94,7 +94,7 @@ def _diff( with_missing and change.old and change.old.hash_info - and not change.old.odb.exists(change.old.hash_info.value) + and not old.odb_map[change.key].exists(change.old.hash_info.value) ): # NOTE: emulating previous behaviour _add_change("not_in_cache", change) diff --git a/dvc/repo/diff.py b/dvc/repo/diff.py index 92f3387e2..917112455 100644 --- a/dvc/repo/diff.py +++ b/dvc/repo/diff.py @@ -229,7 +229,7 @@ def _filter_missing(dvcfs: "DVCFileSystem", paths: Set[str]) -> Iterator[str]: if ( entry and info["type"] == "directory" - and not entry.odb.exists(entry.hash_info.value) + and not dvcfs.repo.odb.local.exists(entry.hash_info.value) ): yield path except FileNotFoundError: diff --git a/dvc/repo/index.py b/dvc/repo/index.py index 84c6208b7..f4a1b70bd 100644 --- a/dvc/repo/index.py +++ b/dvc/repo/index.py @@ -267,6 +267,7 @@ class Index: def data(self) -> "Dict[str, DataIndex]": from collections import defaultdict + from dvc.config import NoRemoteError from dvc_data.index import DataIndex by_workspace: dict = defaultdict(DataIndex) @@ -285,6 +286,14 @@ class Index: entry.key = key data_index.add(entry) + data_index.odb_map[key] = out.odb + try: + data_index.remote_map[key] = self.repo.cloud.get_remote_odb( + out.remote + ) + except NoRemoteError: + pass + return dict(by_workspace) @staticmethod diff --git a/pyproject.toml b/pyproject.toml index 6b4ec15b0..1475d0fdc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ dependencies = [ "dvc-render==0.0.17", "dvc-task==0.1.11", "dvclive>=1.2.2", - "dvc-data==0.36.2", + "dvc-data==0.37.3", "dvc-http", "hydra-core>=1.1.0", "iterative-telemetry==0.0.7",