From 9210486dd502746091ad2a39ecb6b3cd3e288c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Saugat=20Pachhai=20=28=E0=A4=B8=E0=A5=8C=E0=A4=97=E0=A4=BE?= =?UTF-8?q?=E0=A4=A4=29?= Date: Tue, 14 Jun 2022 17:34:00 +0545 Subject: [PATCH] deps: bump dvc-data to 0.0.6; fix imports --- dvc/cli/__init__.py | 2 +- dvc/commands/dag.py | 4 ++-- dvc/data_cloud.py | 16 ++++++++-------- dvc/dependency/param.py | 2 +- dvc/dependency/repo.py | 4 ++-- dvc/fs/data.py | 4 ++-- dvc/output.py | 6 +++--- dvc/repo/__init__.py | 18 +++--------------- dvc/repo/index.py | 2 +- dvc/schema.py | 2 +- dvc/stage/__init__.py | 2 +- dvc/stage/cache.py | 2 +- dvc/stage/loader.py | 4 ++-- dvc/stage/utils.py | 2 +- setup.cfg | 2 +- tests/func/test_add.py | 9 ++++----- tests/func/test_data_cloud.py | 8 ++++---- tests/func/test_ignore.py | 2 +- tests/func/test_install.py | 2 +- tests/func/test_lockfile.py | 2 +- tests/func/test_odb.py | 2 +- tests/func/test_repo_index.py | 2 +- tests/func/test_repro.py | 4 ++-- tests/func/test_run_single_stage.py | 2 +- tests/func/test_state.py | 6 +++--- tests/unit/cli/test_main.py | 2 +- tests/unit/data/db/test_local.py | 2 +- tests/unit/fs/test_data.py | 6 +++--- tests/unit/fs/test_dvc.py | 4 ++-- tests/unit/output/test_local.py | 4 ++-- tests/unit/remote/test_base.py | 2 +- tests/unit/repo/test_repo.py | 2 +- tests/unit/stage/test_loader_pipeline_file.py | 2 +- .../unit/stage/test_serialize_pipeline_lock.py | 2 +- tests/unit/test_hashinfo.py | 2 +- 35 files changed, 63 insertions(+), 76 deletions(-) diff --git a/dvc/cli/__init__.py b/dvc/cli/__init__.py index d9158d8010..d4c132a308 100644 --- a/dvc/cli/__init__.py +++ b/dvc/cli/__init__.py @@ -107,7 +107,7 @@ def _log_exceptions(exc: Exception) -> Optional[int]: ) return 251 - from dvc_objects.hashfile.cache import DiskError + from dvc_data.hashfile.cache import DiskError if isinstance(exc, DiskError): from dvc.utils import relpath diff --git a/dvc/commands/dag.py b/dvc/commands/dag.py index 5797f49bcb..502f619e34 100644 --- a/dvc/commands/dag.py +++ b/dvc/commands/dag.py @@ -70,9 +70,9 @@ def _collect_targets(repo, target, outs): targets.extend([str(out) for out in stage.outs]) continue - for out in outs_trie.itervalues( + for out in outs_trie.itervalues( # noqa: B301 prefix=repo.fs.path.parts(path) - ): # noqa: B301 + ): targets.extend(str(out)) return targets diff --git a/dvc/data_cloud.py b/dvc/data_cloud.py index 1377302b3d..36b3acb37b 100644 --- a/dvc/data_cloud.py +++ b/dvc/data_cloud.py @@ -6,9 +6,9 @@ from dvc_data.db import get_index if TYPE_CHECKING: + from dvc_data.hashfile.db import HashFileDB + from dvc_data.hashfile.hash_info import HashInfo from dvc_data.status import CompareStatusResult - from dvc_objects.db import ObjectDB - from dvc_objects.hashfile.hash_info import HashInfo logger = logging.getLogger(__name__) @@ -31,7 +31,7 @@ def get_remote_odb( self, name: Optional[str] = None, command: str = "", - ) -> "ObjectDB": + ) -> "HashFileDB": from dvc.config import NoRemoteError if not name: @@ -76,8 +76,8 @@ def _log_missing(self, status: "CompareStatusResult"): def transfer( self, - src_odb: "ObjectDB", - dest_odb: "ObjectDB", + src_odb: "HashFileDB", + dest_odb: "HashFileDB", objs: Iterable["HashInfo"], **kwargs, ): @@ -94,7 +94,7 @@ def push( objs: Iterable["HashInfo"], jobs: Optional[int] = None, remote: Optional[str] = None, - odb: Optional["ObjectDB"] = None, + odb: Optional["HashFileDB"] = None, ): """Push data items in a cloud-agnostic way. @@ -121,7 +121,7 @@ def pull( objs: Iterable["HashInfo"], jobs: Optional[int] = None, remote: Optional[str] = None, - odb: Optional["ObjectDB"] = None, + odb: Optional["HashFileDB"] = None, ): """Pull data items in a cloud-agnostic way. @@ -149,7 +149,7 @@ def status( objs: Iterable["HashInfo"], jobs: Optional[int] = None, remote: Optional[str] = None, - odb: Optional["ObjectDB"] = None, + odb: Optional["HashFileDB"] = None, log_missing: bool = True, ): """Check status of data items in a cloud-agnostic way. diff --git a/dvc/dependency/param.py b/dvc/dependency/param.py index 588bd05e7a..bd064bd1bf 100644 --- a/dvc/dependency/param.py +++ b/dvc/dependency/param.py @@ -9,7 +9,7 @@ from dvc.exceptions import DvcException from dvc.utils.serialize import LOADERS, ParseError -from dvc_objects.hashfile.hash_info import HashInfo +from dvc_data.hashfile.hash_info import HashInfo from .base import Dependency diff --git a/dvc/dependency/repo.py b/dvc/dependency/repo.py index a3e1fd52ec..3fdad1ffc1 100644 --- a/dvc/dependency/repo.py +++ b/dvc/dependency/repo.py @@ -10,9 +10,9 @@ from .base import Dependency if TYPE_CHECKING: + from dvc_data.hashfile.file import HashFile + from dvc_data.hashfile.hash_info import HashInfo from dvc_objects.db import ObjectDB - from dvc_objects.hashfile.file import HashFile - from dvc_objects.hashfile.hash_info import HashInfo class RepoDependency(Dependency): diff --git a/dvc/fs/data.py b/dvc/fs/data.py index 72c07333a6..9d4ab8710c 100644 --- a/dvc/fs/data.py +++ b/dvc/fs/data.py @@ -117,12 +117,12 @@ def isdvc(self, path, recursive=False, strict=True): return bool(info.get("outs") if recurse else info.get("isout")) def info(self, path, **kwargs): - from dvc_objects.hashfile.meta import Meta + from dvc_data.hashfile.meta import Meta key = self._get_key(path) try: - outs = list(self.repo.index.tree.iteritems(key)) + outs = list(self.repo.index.tree.iteritems(key)) # noqa: B301 except KeyError as exc: raise FileNotFoundError from exc diff --git a/dvc/output.py b/dvc/output.py index 60c55e6f62..8867c78de5 100644 --- a/dvc/output.py +++ b/dvc/output.py @@ -21,12 +21,12 @@ from dvc_data import check as ocheck from dvc_data import load as oload from dvc_data.checkout import checkout +from dvc_data.hashfile.hash_info import HashInfo +from dvc_data.hashfile.istextfile import istextfile +from dvc_data.hashfile.meta import Meta from dvc_data.stage import stage as ostage from dvc_data.transfer import transfer as otransfer from dvc_objects.errors import ObjectFormatError -from dvc_objects.hashfile.hash_info import HashInfo -from dvc_objects.hashfile.istextfile import istextfile -from dvc_objects.hashfile.meta import Meta from .fs import ( HDFSFileSystem, diff --git a/dvc/repo/__init__.py b/dvc/repo/__init__.py index dad3b32b29..9a8b626476 100644 --- a/dvc/repo/__init__.py +++ b/dvc/repo/__init__.py @@ -3,7 +3,7 @@ from collections import defaultdict from contextlib import contextmanager from functools import wraps -from typing import TYPE_CHECKING, Callable, Optional, Set +from typing import TYPE_CHECKING, Callable, Optional from funcy import cached_property @@ -18,7 +18,6 @@ from dvc.fs import FileSystem from dvc.repo.scm_context import SCMContext from dvc.scm import Base - from dvc_objects.hashfile.file import HashFile logger = logging.getLogger(__name__) @@ -165,7 +164,7 @@ def __init__( from dvc.repo.stage import StageLoad from dvc.scm import SCM from dvc.stage.cache import StageCache - from dvc_objects.hashfile.state import State, StateNoop + from dvc_data.hashfile.state import State, StateNoop self.url = url self._fs_conf = {"repo_factory": repo_factory} @@ -411,16 +410,7 @@ def used_objs( """ used = defaultdict(set) - def _add_suffix(objs: Set["HashFile"], suffix: str) -> None: - from itertools import chain - - from dvc_data import iterobjs - - for obj in chain.from_iterable(map(iterobjs, objs)): - if obj.name is not None: - obj.name += suffix - - for branch in self.brancher( + for _ in self.brancher( revs=revs, all_branches=all_branches, all_tags=all_tags, @@ -435,8 +425,6 @@ def _add_suffix(objs: Set["HashFile"], suffix: str) -> None: recursive=recursive, with_deps=with_deps, ).items(): - if branch: - _add_suffix(objs, f" ({branch})") used[odb].update(objs) if used_run_cache: diff --git a/dvc/repo/index.py b/dvc/repo/index.py index 1090651e08..7d31b6bb3a 100644 --- a/dvc/repo/index.py +++ b/dvc/repo/index.py @@ -26,8 +26,8 @@ from dvc.stage import Stage from dvc.types import StrPath, TargetType from dvc_data import Tree + from dvc_data.hashfile.hash_info import HashInfo from dvc_objects.db import ObjectDB - from dvc_objects.hashfile.hash_info import HashInfo ObjectContainer = Dict[Optional["ObjectDB"], Set["HashInfo"]] diff --git a/dvc/schema.py b/dvc/schema.py index aa2cadbd90..ff994c5f0c 100644 --- a/dvc/schema.py +++ b/dvc/schema.py @@ -7,7 +7,7 @@ from dvc.parsing import DO_KWD, FOREACH_KWD, VARS_KWD from dvc.parsing.versions import SCHEMA_KWD, lockfile_version_schema from dvc.stage.params import StageParams -from dvc_objects.hashfile.meta import Meta +from dvc_data.hashfile.meta import Meta STAGES = "stages" SINGLE_STAGE_SCHEMA = { diff --git a/dvc/stage/__init__.py b/dvc/stage/__init__.py index 60c4529932..a871073dab 100644 --- a/dvc/stage/__init__.py +++ b/dvc/stage/__init__.py @@ -36,8 +36,8 @@ if TYPE_CHECKING: from dvc.dvcfile import DVCFile + from dvc_data.hashfile.hash_info import HashInfo from dvc_objects.db.base import ObjectDB - from dvc_objects.hashfile.hash_info import HashInfo logger = logging.getLogger(__name__) # Disallow all punctuation characters except hyphen and underscore diff --git a/dvc/stage/cache.py b/dvc/stage/cache.py index e5ac33d331..1d6f41fb11 100644 --- a/dvc/stage/cache.py +++ b/dvc/stage/cache.py @@ -27,7 +27,7 @@ class RunCacheNotSupported(DvcException): def _get_cache_hash(cache, key=False): - from dvc_objects.hashfile.meta import Meta + from dvc_data.hashfile.meta import Meta if key: cache["outs"] = [out["path"] for out in cache.get("outs", [])] diff --git a/dvc/stage/loader.py b/dvc/stage/loader.py index 231412b694..8d498e4717 100644 --- a/dvc/stage/loader.py +++ b/dvc/stage/loader.py @@ -8,8 +8,8 @@ from dvc import dependency, output from dvc.parsing import FOREACH_KWD, JOIN, DataResolver, EntryNotFound from dvc.parsing.versions import LOCKFILE_VERSION -from dvc_objects.hashfile.hash_info import HashInfo -from dvc_objects.hashfile.meta import Meta +from dvc_data.hashfile.hash_info import HashInfo +from dvc_data.hashfile.meta import Meta from . import PipelineStage, Stage, loads_from from .exceptions import StageNameUnspecified, StageNotFound diff --git a/dvc/stage/utils.py b/dvc/stage/utils.py index fda5c0f55d..c2bd38c176 100644 --- a/dvc/stage/utils.py +++ b/dvc/stage/utils.py @@ -5,7 +5,7 @@ from funcy import concat, first, lsplit, rpartial, without from dvc.exceptions import InvalidArgumentError -from dvc_objects.hashfile.meta import Meta +from dvc_data.hashfile.meta import Meta from .exceptions import ( MissingDataSource, diff --git a/setup.cfg b/setup.cfg index e36960df10..e9d7a56e10 100644 --- a/setup.cfg +++ b/setup.cfg @@ -69,7 +69,7 @@ install_requires = scmrepo==0.0.24 dvc-render==0.0.6 dvclive>=0.7.3 - dvc-data==0.0.5 + dvc-data==0.0.6 [options.extras_require] all = diff --git a/tests/func/test_add.py b/tests/func/test_add.py index b17d42d819..90420e8d8e 100644 --- a/tests/func/test_add.py +++ b/tests/func/test_add.py @@ -12,7 +12,6 @@ import dvc as dvc_module import dvc_data -import dvc_objects from dvc.cli import main from dvc.dvcfile import DVC_FILE_SUFFIX from dvc.exceptions import ( @@ -38,8 +37,8 @@ from dvc.utils import LARGE_DIR_SIZE, relpath from dvc.utils.fs import path_isin from dvc.utils.serialize import YAMLFileCorruptedError, load_yaml -from dvc_objects.hashfile.hash import file_md5 -from dvc_objects.hashfile.hash_info import HashInfo +from dvc_data.hashfile.hash import file_md5 +from dvc_data.hashfile.hash_info import HashInfo from tests.basic_env import TestDvc from tests.utils import get_gitignore_content @@ -380,7 +379,7 @@ def test_dir(self): def test_should_update_state_entry_for_file_after_add(mocker, dvc, tmp_dir): - file_md5_counter = mocker.spy(dvc_objects.hashfile.hash, "file_md5") + file_md5_counter = mocker.spy(dvc_data.hashfile.hash, "file_md5") tmp_dir.gen("foo", "foo") ret = main(["config", "cache.type", "copy"]) @@ -411,7 +410,7 @@ def test_should_update_state_entry_for_file_after_add(mocker, dvc, tmp_dir): def test_should_update_state_entry_for_directory_after_add( mocker, dvc, tmp_dir ): - file_md5_counter = mocker.spy(dvc_objects.hashfile.hash, "file_md5") + file_md5_counter = mocker.spy(dvc_data.hashfile.hash, "file_md5") tmp_dir.gen({"data/data": "foo", "data/data_sub/sub_data": "foo"}) diff --git a/tests/func/test_data_cloud.py b/tests/func/test_data_cloud.py index 730628a699..592d8ede29 100644 --- a/tests/func/test_data_cloud.py +++ b/tests/func/test_data_cloud.py @@ -5,7 +5,7 @@ import pytest from flaky.flaky_decorator import flaky -import dvc_objects +import dvc_data from dvc.cli import main from dvc.external_repo import clean_repos from dvc.stage.exceptions import StageNotFound @@ -14,7 +14,7 @@ ) from dvc.utils.fs import remove from dvc_data.db.local import LocalHashFileDB -from dvc_objects.hashfile.db import HashFileDB +from dvc_data.hashfile.db import HashFileDB def test_cloud_cli(tmp_dir, dvc, remote, mocker): @@ -148,7 +148,7 @@ def test_warn_on_outdated_stage(tmp_dir, dvc, local_remote, caplog): def test_hash_recalculation(mocker, dvc, tmp_dir, local_remote): tmp_dir.gen({"foo": "foo"}) - test_file_md5 = mocker.spy(dvc_objects.hashfile.hash, "file_md5") + test_file_md5 = mocker.spy(dvc_data.hashfile.hash, "file_md5") ret = main(["config", "cache.type", "hardlink"]) assert ret == 0 ret = main(["add", "foo"]) @@ -210,7 +210,7 @@ def test_verify_hashes( remove("dir") remove(dvc.odb.local.cache_dir) - hash_spy = mocker.spy(dvc_objects.hashfile.hash, "file_md5") + hash_spy = mocker.spy(dvc_data.hashfile.hash, "file_md5") dvc.pull() assert hash_spy.call_count == 0 diff --git a/tests/func/test_ignore.py b/tests/func/test_ignore.py index d739f06b9b..0ed6cf24c3 100644 --- a/tests/func/test_ignore.py +++ b/tests/func/test_ignore.py @@ -10,8 +10,8 @@ from dvc.repo import Repo from dvc.testing.tmp_dir import TmpDir from dvc.types import List +from dvc_data.hashfile.utils import get_mtime_and_size from dvc_data.stage import IgnoreInCollectedDirError -from dvc_objects.hashfile.utils import get_mtime_and_size def _to_pattern_info_list(str_list: List): diff --git a/tests/func/test_install.py b/tests/func/test_install.py index eff03d6594..a4a800c9d2 100644 --- a/tests/func/test_install.py +++ b/tests/func/test_install.py @@ -6,7 +6,7 @@ from git import GitCommandError from dvc.exceptions import DvcException -from dvc_objects.hashfile.hash import file_md5 +from dvc_data.hashfile.hash import file_md5 from tests.func.parsing.test_errors import escape_ansi diff --git a/tests/func/test_lockfile.py b/tests/func/test_lockfile.py index 3570852a8c..93974978f1 100644 --- a/tests/func/test_lockfile.py +++ b/tests/func/test_lockfile.py @@ -10,7 +10,7 @@ from dvc.utils.fs import remove from dvc.utils.serialize import dumps_yaml, parse_yaml_for_update from dvc.utils.strictyaml import YAMLValidationError, make_relpath -from dvc_objects.hashfile.hash_info import HashInfo +from dvc_data.hashfile.hash_info import HashInfo from tests.func.test_run_multistage import supported_params FS_STRUCTURE = { diff --git a/tests/func/test_odb.py b/tests/func/test_odb.py index 56473ebfb2..6d388afc08 100644 --- a/tests/func/test_odb.py +++ b/tests/func/test_odb.py @@ -7,8 +7,8 @@ from dvc.cli import main from dvc.odbmgr import ODBManager from dvc.utils import relpath +from dvc_data.hashfile.hash_info import HashInfo from dvc_objects.errors import ObjectFormatError -from dvc_objects.hashfile.hash_info import HashInfo def test_cache(tmp_dir, dvc): diff --git a/tests/func/test_repo_index.py b/tests/func/test_repo_index.py index c796de7e25..c419d88fc1 100644 --- a/tests/func/test_repo_index.py +++ b/tests/func/test_repo_index.py @@ -258,7 +258,7 @@ def get_index(dvc, rev): @pytest.mark.parametrize("rev", ["workspace", "HEAD"]) def test_used_objs(tmp_dir, scm, dvc, run_copy, rev): - from dvc_objects.hashfile.hash_info import HashInfo + from dvc_data.hashfile.hash_info import HashInfo dvc.config["core"]["autostage"] = True tmp_dir.dvc_gen({"dir": {"subdir": {"file": "file"}}, "foo": "foo"}) diff --git a/tests/func/test_repro.py b/tests/func/test_repro.py index e7ec4aaf2d..4fd436a773 100644 --- a/tests/func/test_repro.py +++ b/tests/func/test_repro.py @@ -21,7 +21,7 @@ from dvc.utils import relpath from dvc.utils.fs import remove from dvc.utils.serialize import dump_yaml, load_yaml -from dvc_objects.hashfile.hash import file_md5 +from dvc_data.hashfile.hash import file_md5 from tests.basic_env import TestDvc @@ -817,7 +817,7 @@ def test(self): ), ] - from dvc_objects.hashfile.state import StateNoop + from dvc_data.hashfile.state import StateNoop self.dvc.state = StateNoop() diff --git a/tests/func/test_run_single_stage.py b/tests/func/test_run_single_stage.py index d8cd4a6425..8c842ae783 100644 --- a/tests/func/test_run_single_stage.py +++ b/tests/func/test_run_single_stage.py @@ -31,7 +31,7 @@ StagePathOutsideError, ) from dvc.utils.serialize import load_yaml -from dvc_objects.hashfile.hash import file_md5 +from dvc_data.hashfile.hash import file_md5 from tests.basic_env import TestDvc, TestDvcGit diff --git a/tests/func/test_state.py b/tests/func/test_state.py index e3e4c701fc..1e4f6ae6c7 100644 --- a/tests/func/test_state.py +++ b/tests/func/test_state.py @@ -2,9 +2,9 @@ import re from dvc.repo import Repo -from dvc_objects.hashfile.hash import file_md5 -from dvc_objects.hashfile.hash_info import HashInfo -from dvc_objects.hashfile.state import State +from dvc_data.hashfile.hash import file_md5 +from dvc_data.hashfile.hash_info import HashInfo +from dvc_data.hashfile.state import State def test_state(tmp_dir, dvc): diff --git a/tests/unit/cli/test_main.py b/tests/unit/cli/test_main.py index 56f4461478..0378142f2c 100644 --- a/tests/unit/cli/test_main.py +++ b/tests/unit/cli/test_main.py @@ -4,9 +4,9 @@ from funcy import raiser from dvc.cli import main +from dvc_data.hashfile.cache import DiskError from dvc_data.stage import IgnoreInCollectedDirError from dvc_objects.fs.base import FileSystem, RemoteMissingDepsError -from dvc_objects.hashfile.cache import DiskError def test_state_pickle_errors_are_correctly_raised(tmp_dir, caplog, mocker): diff --git a/tests/unit/data/db/test_local.py b/tests/unit/data/db/test_local.py index b68256f344..2fe65e1770 100644 --- a/tests/unit/data/db/test_local.py +++ b/tests/unit/data/db/test_local.py @@ -5,7 +5,7 @@ from dvc.fs import LocalFileSystem from dvc_data.db.local import LocalHashFileDB -from dvc_objects.hashfile.hash_info import HashInfo +from dvc_data.hashfile.hash_info import HashInfo def test_status_download_optimization(mocker, dvc): diff --git a/tests/unit/fs/test_data.py b/tests/unit/fs/test_data.py index 2df12cd5ba..2c7f0b3aac 100644 --- a/tests/unit/fs/test_data.py +++ b/tests/unit/fs/test_data.py @@ -3,12 +3,12 @@ import pytest -import dvc_objects +import dvc_data from dvc.config import NoRemoteError from dvc.fs.data import DataFileSystem from dvc.utils.fs import remove +from dvc_data.hashfile.hash_info import HashInfo from dvc_data.stage import stage -from dvc_objects.hashfile.hash_info import HashInfo @pytest.mark.parametrize( @@ -231,7 +231,7 @@ def test_get_hash_dir(tmp_dir, dvc, mocker): {"dir": {"foo": "foo", "bar": "bar", "subdir": {"data": "data"}}} ) fs = DataFileSystem(repo=dvc) - hash_file_spy = mocker.spy(dvc_objects.hashfile.hash, "hash_file") + hash_file_spy = mocker.spy(dvc_data.hashfile.hash, "hash_file") assert fs.info("dir")["md5"] == "8761c4e9acad696bee718615e23e22db.dir" assert not hash_file_spy.called diff --git a/tests/unit/fs/test_dvc.py b/tests/unit/fs/test_dvc.py index 097601be7b..09261f4332 100644 --- a/tests/unit/fs/test_dvc.py +++ b/tests/unit/fs/test_dvc.py @@ -6,8 +6,8 @@ import pytest from dvc.fs.dvc import DvcFileSystem +from dvc_data.hashfile.hash_info import HashInfo from dvc_data.stage import stage -from dvc_objects.hashfile.hash_info import HashInfo from tests.utils import clean_staging @@ -576,8 +576,8 @@ def test_get_hash_mixed_dir(tmp_dir, scm, dvc): def test_get_hash_dirty_file(tmp_dir, dvc): from dvc_data import check + from dvc_data.hashfile.hash import hash_file from dvc_objects.errors import ObjectFormatError - from dvc_objects.hashfile.hash import hash_file tmp_dir.dvc_gen("file", "file") file_hash_info = HashInfo("md5", "8c7dd922ad47494fc02c388e12c00eac") diff --git a/tests/unit/output/test_local.py b/tests/unit/output/test_local.py index c8c1824794..5d1ca10cac 100644 --- a/tests/unit/output/test_local.py +++ b/tests/unit/output/test_local.py @@ -4,8 +4,8 @@ from dvc.output import Output from dvc.stage import Stage from dvc.utils import relpath -from dvc_objects.hashfile.hash_info import HashInfo -from dvc_objects.hashfile.meta import Meta +from dvc_data.hashfile.hash_info import HashInfo +from dvc_data.hashfile.meta import Meta from tests.basic_env import TestDvc diff --git a/tests/unit/remote/test_base.py b/tests/unit/remote/test_base.py index 7d729c6c7b..aa1ebfc593 100644 --- a/tests/unit/remote/test_base.py +++ b/tests/unit/remote/test_base.py @@ -3,7 +3,7 @@ from unittest import mock from dvc.fs import FileSystem -from dvc_objects.hashfile.db import ObjectDB +from dvc_data.hashfile.db import ObjectDB class _CallableOrNone: diff --git a/tests/unit/repo/test_repo.py b/tests/unit/repo/test_repo.py index f468621f2a..efb1ead44f 100644 --- a/tests/unit/repo/test_repo.py +++ b/tests/unit/repo/test_repo.py @@ -5,7 +5,7 @@ from dvc.exceptions import OutputDuplicationError from dvc.repo import NotDvcRepoError, Repo, locked -from dvc_objects.hashfile.hash_info import HashInfo +from dvc_data.hashfile.hash_info import HashInfo def test_is_dvc_internal(dvc): diff --git a/tests/unit/stage/test_loader_pipeline_file.py b/tests/unit/stage/test_loader_pipeline_file.py index b7acfd33fb..5ef37201bc 100644 --- a/tests/unit/stage/test_loader_pipeline_file.py +++ b/tests/unit/stage/test_loader_pipeline_file.py @@ -8,7 +8,7 @@ from dvc.stage import PipelineStage, create_stage from dvc.stage.loader import StageLoader from dvc.stage.serialize import split_params_deps -from dvc_objects.hashfile.hash_info import HashInfo +from dvc_data.hashfile.hash_info import HashInfo @pytest.fixture diff --git a/tests/unit/stage/test_serialize_pipeline_lock.py b/tests/unit/stage/test_serialize_pipeline_lock.py index 576a199935..c20fc19f45 100644 --- a/tests/unit/stage/test_serialize_pipeline_lock.py +++ b/tests/unit/stage/test_serialize_pipeline_lock.py @@ -11,7 +11,7 @@ to_single_stage_lockfile as _to_single_stage_lockfile, ) from dvc.stage.utils import split_params_deps -from dvc_objects.hashfile.hash_info import HashInfo +from dvc_data.hashfile.hash_info import HashInfo kwargs = {"name": "something", "cmd": "command", "path": PIPELINE_FILE} Schema = _Schema(LOCK_FILE_STAGE_SCHEMA) diff --git a/tests/unit/test_hashinfo.py b/tests/unit/test_hashinfo.py index 9dd9ac8cab..c7da09f336 100644 --- a/tests/unit/test_hashinfo.py +++ b/tests/unit/test_hashinfo.py @@ -1,4 +1,4 @@ -from dvc_objects.hashfile.hash_info import HashInfo +from dvc_data.hashfile.hash_info import HashInfo def test_as_raw():