From 793f97bdd504d7564a04a9031387fe8af3f0affc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Trifir=C3=B2?= Date: Tue, 7 Jun 2022 17:49:34 +0200 Subject: [PATCH] fix dvc-objects/data imports --- dvc/cli/__init__.py | 2 +- dvc/data_cloud.py | 2 +- dvc/dependency/param.py | 2 +- dvc/dependency/repo.py | 8 ++++---- dvc/fs/data.py | 2 +- dvc/output.py | 12 ++++++------ dvc/repo/__init__.py | 4 ++-- dvc/repo/index.py | 6 +++--- dvc/schema.py | 2 +- dvc/stage/__init__.py | 2 +- dvc/stage/cache.py | 2 +- dvc/stage/loader.py | 4 ++-- dvc/stage/utils.py | 2 +- tests/func/test_add.py | 8 ++++---- tests/func/test_data_cloud.py | 6 +++--- 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_remote.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_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/data/test_tree.py | 6 +++--- tests/unit/fs/test_data.py | 4 ++-- 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 +- tests/unit/stage/test_serialize_pipeline_lock.py | 2 +- tests/unit/test_hashinfo.py | 2 +- 36 files changed, 61 insertions(+), 61 deletions(-) diff --git a/dvc/cli/__init__.py b/dvc/cli/__init__.py index 69d00bd10..d9158d801 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.cache import DiskError + from dvc_objects.hashfile.cache import DiskError if isinstance(exc, DiskError): from dvc.utils import relpath diff --git a/dvc/data_cloud.py b/dvc/data_cloud.py index b5ee7bede..096f0948c 100644 --- a/dvc/data_cloud.py +++ b/dvc/data_cloud.py @@ -8,7 +8,7 @@ from dvc_data.db import get_index if TYPE_CHECKING: from dvc_data.status import CompareStatusResult from dvc_objects.db import ObjectDB - from dvc_objects.hash_info import HashInfo + from dvc_objects.hashfile.hash_info import HashInfo logger = logging.getLogger(__name__) diff --git a/dvc/dependency/param.py b/dvc/dependency/param.py index 2c493f3b4..588bd05e7 100644 --- a/dvc/dependency/param.py +++ b/dvc/dependency/param.py @@ -9,7 +9,7 @@ from voluptuous import Any from dvc.exceptions import DvcException from dvc.utils.serialize import LOADERS, ParseError -from dvc_objects.hash_info import HashInfo +from dvc_objects.hashfile.hash_info import HashInfo from .base import Dependency diff --git a/dvc/dependency/repo.py b/dvc/dependency/repo.py index f8fda63f3..c6ee61883 100644 --- a/dvc/dependency/repo.py +++ b/dvc/dependency/repo.py @@ -11,8 +11,8 @@ from .base import Dependency if TYPE_CHECKING: from dvc_objects.db import ObjectDB - from dvc_objects.file import HashFile - from dvc_objects.hash_info import HashInfo + from dvc_objects.hashfile.file import HashFile + from dvc_objects.hashfile.hash_info import HashInfo class RepoDependency(Dependency): @@ -103,8 +103,8 @@ class RepoDependency(Dependency): from dvc.config import NoRemoteError from dvc.exceptions import NoOutputOrStageError, PathMissingError from dvc.utils import as_posix + from dvc_data.objects.tree import Tree, TreeError from dvc_data.stage import stage - from dvc_data.tree import Tree, TreeError local_odb = self.repo.odb.local locked = kwargs.pop("locked", True) @@ -156,7 +156,7 @@ class RepoDependency(Dependency): from dvc.exceptions import CircularImportError from dvc.fs.dvc import DvcFileSystem from dvc_data.db.reference import ReferenceObjectDB - from dvc_data.tree import Tree + from dvc_data.objects.tree import Tree if not isinstance(odb, ReferenceObjectDB): return diff --git a/dvc/fs/data.py b/dvc/fs/data.py index ee52b9486..ecb3314c4 100644 --- a/dvc/fs/data.py +++ b/dvc/fs/data.py @@ -117,7 +117,7 @@ class _DataFileSystem(AbstractFileSystem): # pylint:disable=abstract-method return bool(info.get("outs") if recurse else info.get("isout")) def info(self, path, **kwargs): - from dvc_objects.meta import Meta + from dvc_objects.hashfile.meta import Meta key = self._get_key(path) diff --git a/dvc/output.py b/dvc/output.py index 4a475ec03..c039cf794 100644 --- a/dvc/output.py +++ b/dvc/output.py @@ -17,16 +17,16 @@ from dvc.exceptions import ( MergeError, RemoteCacheRequiredError, ) +from dvc_data import Tree from dvc_data import check as ocheck from dvc_data import load as oload from dvc_data.checkout import checkout from dvc_data.stage import stage as ostage from dvc_data.transfer import transfer as otransfer -from dvc_data.tree import Tree from dvc_objects.errors import ObjectFormatError -from dvc_objects.hash_info import HashInfo -from dvc_objects.istextfile import istextfile -from dvc_objects.meta import Meta +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, @@ -1044,8 +1044,8 @@ class Output: ) def merge(self, ancestor, other): - from dvc_data.tree import MergeError as TreeMergeError - from dvc_data.tree import du, merge + from dvc_data.objects.tree import MergeError as TreeMergeError + from dvc_data.objects.tree import du, merge assert other diff --git a/dvc/repo/__init__.py b/dvc/repo/__init__.py index 94c865c25..5b4917d9c 100644 --- a/dvc/repo/__init__.py +++ b/dvc/repo/__init__.py @@ -18,7 +18,7 @@ if TYPE_CHECKING: from dvc.fs import FileSystem from dvc.repo.scm_context import SCMContext from dvc.scm import Base - from dvc_objects.file import HashFile + from dvc_objects.hashfile.file import HashFile logger = logging.getLogger(__name__) @@ -165,7 +165,7 @@ class Repo: from dvc.repo.stage import StageLoad from dvc.scm import SCM from dvc.stage.cache import StageCache - from dvc_objects.state import State, StateNoop + from dvc_objects.hashfile.state import State, StateNoop self.url = url self._fs_conf = {"repo_factory": repo_factory} diff --git a/dvc/repo/index.py b/dvc/repo/index.py index 79613c999..1a2eda587 100644 --- a/dvc/repo/index.py +++ b/dvc/repo/index.py @@ -25,9 +25,9 @@ if TYPE_CHECKING: from dvc.repo.stage import StageLoad from dvc.stage import Stage from dvc.types import StrPath, TargetType - from dvc_data.tree import Tree + from dvc_data import Tree from dvc_objects.db import ObjectDB - from dvc_objects.hash_info import HashInfo + from dvc_objects.hashfile.hash_info import HashInfo ObjectContainer = Dict[Optional["ObjectDB"], Set["HashInfo"]] @@ -170,7 +170,7 @@ class Index: @cached_property def tree(self) -> "Tree": from dvc.config import NoRemoteError - from dvc_data.tree import Tree + from dvc_data import Tree tree = Tree(None, None, None) diff --git a/dvc/schema.py b/dvc/schema.py index 72eccb049..aa2cadbd9 100644 --- a/dvc/schema.py +++ b/dvc/schema.py @@ -7,7 +7,7 @@ from dvc.output import CHECKSUMS_SCHEMA, Output 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.meta import Meta +from dvc_objects.hashfile.meta import Meta STAGES = "stages" SINGLE_STAGE_SCHEMA = { diff --git a/dvc/stage/__init__.py b/dvc/stage/__init__.py index f9faa9cc0..60c452993 100644 --- a/dvc/stage/__init__.py +++ b/dvc/stage/__init__.py @@ -37,7 +37,7 @@ from .utils import ( if TYPE_CHECKING: from dvc.dvcfile import DVCFile from dvc_objects.db.base import ObjectDB - from dvc_objects.hash_info import HashInfo + 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 7a0f4518c..a18d5d9fe 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.meta import Meta + from dvc_objects.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 00e5f3768..231412b69 100644 --- a/dvc/stage/loader.py +++ b/dvc/stage/loader.py @@ -8,8 +8,8 @@ from funcy import cached_property, get_in, lcat, once, project from dvc import dependency, output from dvc.parsing import FOREACH_KWD, JOIN, DataResolver, EntryNotFound from dvc.parsing.versions import LOCKFILE_VERSION -from dvc_objects.hash_info import HashInfo -from dvc_objects.meta import Meta +from dvc_objects.hashfile.hash_info import HashInfo +from dvc_objects.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 6dd2b4723..fda5c0f55 100644 --- a/dvc/stage/utils.py +++ b/dvc/stage/utils.py @@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Union from funcy import concat, first, lsplit, rpartial, without from dvc.exceptions import InvalidArgumentError -from dvc_objects.meta import Meta +from dvc_objects.hashfile.meta import Meta from .exceptions import ( MissingDataSource, diff --git a/tests/func/test_add.py b/tests/func/test_add.py index 3846e5fc5..91ae21c6c 100644 --- a/tests/func/test_add.py +++ b/tests/func/test_add.py @@ -38,8 +38,8 @@ from dvc.testing.test_workspace import TestAdd 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.hash import file_md5 -from dvc_objects.hash_info import HashInfo +from dvc_objects.hashfile.hash import file_md5 +from dvc_objects.hashfile.hash_info import HashInfo from tests.basic_env import TestDvc from tests.utils import get_gitignore_content @@ -380,7 +380,7 @@ class TestDoubleAddUnchanged(TestDvc): def test_should_update_state_entry_for_file_after_add(mocker, dvc, tmp_dir): - file_md5_counter = mocker.spy(dvc_objects.hash, "file_md5") + file_md5_counter = mocker.spy(dvc_objects.hashfile.hash, "file_md5") tmp_dir.gen("foo", "foo") ret = main(["config", "cache.type", "copy"]) @@ -411,7 +411,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.hash, "file_md5") + file_md5_counter = mocker.spy(dvc_objects.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 3a827ab23..62cd7d689 100644 --- a/tests/func/test_data_cloud.py +++ b/tests/func/test_data_cloud.py @@ -14,7 +14,7 @@ from dvc.testing.test_remote import ( # noqa, pylint: disable=unused-import ) from dvc.utils.fs import remove from dvc_data.db.local import LocalObjectDB -from dvc_objects.db import ObjectDB +from dvc_objects.hashfile.db import ObjectDB def test_cloud_cli(tmp_dir, dvc, remote, mocker): @@ -149,7 +149,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.hash, "file_md5") + test_file_md5 = mocker.spy(dvc_objects.hashfile.hash, "file_md5") ret = main(["config", "cache.type", "hardlink"]) assert ret == 0 ret = main(["add", "foo"]) @@ -211,7 +211,7 @@ def test_verify_hashes( remove("dir") remove(dvc.odb.local.cache_dir) - hash_spy = mocker.spy(dvc_objects.hash, "file_md5") + hash_spy = mocker.spy(dvc_objects.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 d39213ef2..d739f06b9 100644 --- a/tests/func/test_ignore.py +++ b/tests/func/test_ignore.py @@ -11,7 +11,7 @@ from dvc.repo import Repo from dvc.testing.tmp_dir import TmpDir from dvc.types import List from dvc_data.stage import IgnoreInCollectedDirError -from dvc_objects.utils import get_mtime_and_size +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 d1f319508..eff03d659 100644 --- a/tests/func/test_install.py +++ b/tests/func/test_install.py @@ -6,7 +6,7 @@ import pytest from git import GitCommandError from dvc.exceptions import DvcException -from dvc_objects.hash import file_md5 +from dvc_objects.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 b7dba8870..3570852a8 100644 --- a/tests/func/test_lockfile.py +++ b/tests/func/test_lockfile.py @@ -10,7 +10,7 @@ from dvc.stage.utils import split_params_deps 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.hash_info import HashInfo +from dvc_objects.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 f32595f02..6bee78147 100644 --- a/tests/func/test_odb.py +++ b/tests/func/test_odb.py @@ -8,7 +8,7 @@ from dvc.cli import main from dvc.odbmgr import ODBManager from dvc.utils import relpath from dvc_objects.errors import ObjectFormatError -from dvc_objects.hash_info import HashInfo +from dvc_objects.hashfile.hash_info import HashInfo def test_cache(tmp_dir, dvc): diff --git a/tests/func/test_remote.py b/tests/func/test_remote.py index 4c1c8de20..8e8e0fc52 100644 --- a/tests/func/test_remote.py +++ b/tests/func/test_remote.py @@ -139,8 +139,8 @@ def test_upper_case_remote(tmp_dir, dvc, local_cloud): def test_dir_hash_should_be_key_order_agnostic(tmp_dir, dvc): + from dvc_data.objects.tree import Tree from dvc_data.stage import stage - from dvc_data.tree import Tree tmp_dir.gen({"data": {"1": "1 content", "2": "2 content"}}) diff --git a/tests/func/test_repo_index.py b/tests/func/test_repo_index.py index 37b2a3b9c..c796de7e2 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.hash_info import HashInfo + from dvc_objects.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 86394cabf..e7ec4aaf2 100644 --- a/tests/func/test_repro.py +++ b/tests/func/test_repro.py @@ -21,7 +21,7 @@ from dvc.stage.exceptions import StageFileDoesNotExistError from dvc.utils import relpath from dvc.utils.fs import remove from dvc.utils.serialize import dump_yaml, load_yaml -from dvc_objects.hash import file_md5 +from dvc_objects.hashfile.hash import file_md5 from tests.basic_env import TestDvc @@ -817,7 +817,7 @@ class TestReproAllPipelines(SingleStageRun, TestDvc): ), ] - from dvc_objects.state import StateNoop + from dvc_objects.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 79391af71..d8cd4a642 100644 --- a/tests/func/test_run_single_stage.py +++ b/tests/func/test_run_single_stage.py @@ -31,7 +31,7 @@ from dvc.stage.exceptions import ( StagePathOutsideError, ) from dvc.utils.serialize import load_yaml -from dvc_objects.hash import file_md5 +from dvc_objects.hashfile.hash import file_md5 from tests.basic_env import TestDvc, TestDvcGit diff --git a/tests/func/test_stage.py b/tests/func/test_stage.py index 560ba0438..b500c5d1e 100644 --- a/tests/func/test_stage.py +++ b/tests/func/test_stage.py @@ -343,7 +343,7 @@ def test_stage_dir_optimization( tmp_dir, dvc, mocker, dry_run, expected_staging_contents ): from dvc_data import stage - from dvc_data.tree import Tree + from dvc_data.objects.tree import Tree tmp_dir.dvc_gen( { diff --git a/tests/func/test_state.py b/tests/func/test_state.py index 0e099cce1..e3e4c701f 100644 --- a/tests/func/test_state.py +++ b/tests/func/test_state.py @@ -2,9 +2,9 @@ import os import re from dvc.repo import Repo -from dvc_objects.hash import file_md5 -from dvc_objects.hash_info import HashInfo -from dvc_objects.state import State +from dvc_objects.hashfile.hash import file_md5 +from dvc_objects.hashfile.hash_info import HashInfo +from dvc_objects.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 40b753f9d..56f446147 100644 --- a/tests/unit/cli/test_main.py +++ b/tests/unit/cli/test_main.py @@ -5,8 +5,8 @@ from funcy import raiser from dvc.cli import main from dvc_data.stage import IgnoreInCollectedDirError -from dvc_objects.cache import DiskError 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 e96e64454..6e60294f8 100644 --- a/tests/unit/data/db/test_local.py +++ b/tests/unit/data/db/test_local.py @@ -5,7 +5,7 @@ import pytest from dvc.fs import LocalFileSystem from dvc_data.db.local import LocalObjectDB -from dvc_objects.hash_info import HashInfo +from dvc_objects.hashfile.hash_info import HashInfo def test_status_download_optimization(mocker, dvc): diff --git a/tests/unit/data/test_tree.py b/tests/unit/data/test_tree.py index 0c46664a1..49f972feb 100644 --- a/tests/unit/data/test_tree.py +++ b/tests/unit/data/test_tree.py @@ -2,9 +2,9 @@ from operator import itemgetter import pytest -from dvc_data.tree import Tree, _merge -from dvc_objects.hash_info import HashInfo -from dvc_objects.meta import Meta +from dvc_data.objects.tree import Tree, _merge +from dvc_objects.hashfile.hash_info import HashInfo +from dvc_objects.hashfile.meta import Meta @pytest.mark.parametrize( diff --git a/tests/unit/fs/test_data.py b/tests/unit/fs/test_data.py index 8ffbcec8a..2df12cd5b 100644 --- a/tests/unit/fs/test_data.py +++ b/tests/unit/fs/test_data.py @@ -8,7 +8,7 @@ from dvc.config import NoRemoteError from dvc.fs.data import DataFileSystem from dvc.utils.fs import remove from dvc_data.stage import stage -from dvc_objects.hash_info import HashInfo +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.hash, "hash_file") + hash_file_spy = mocker.spy(dvc_objects.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 95f4de33a..097601be7 100644 --- a/tests/unit/fs/test_dvc.py +++ b/tests/unit/fs/test_dvc.py @@ -7,7 +7,7 @@ import pytest from dvc.fs.dvc import DvcFileSystem from dvc_data.stage import stage -from dvc_objects.hash_info import HashInfo +from dvc_objects.hashfile.hash_info import HashInfo from tests.utils import clean_staging @@ -577,7 +577,7 @@ 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_objects.errors import ObjectFormatError - from dvc_objects.hash import hash_file + 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 e37143685..c8c182479 100644 --- a/tests/unit/output/test_local.py +++ b/tests/unit/output/test_local.py @@ -4,8 +4,8 @@ from unittest.mock import patch from dvc.output import Output from dvc.stage import Stage from dvc.utils import relpath -from dvc_objects.hash_info import HashInfo -from dvc_objects.meta import Meta +from dvc_objects.hashfile.hash_info import HashInfo +from dvc_objects.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 0c49f6ba0..2f9f560bd 100644 --- a/tests/unit/remote/test_base.py +++ b/tests/unit/remote/test_base.py @@ -3,7 +3,7 @@ import posixpath from unittest import mock from dvc.fs import FileSystem -from dvc_objects.db import ObjectDB +from dvc_objects.hashfile.db import ObjectDB class _CallableOrNone: diff --git a/tests/unit/repo/test_repo.py b/tests/unit/repo/test_repo.py index a7d91f5b5..f468621f2 100644 --- a/tests/unit/repo/test_repo.py +++ b/tests/unit/repo/test_repo.py @@ -5,7 +5,7 @@ import pytest from dvc.exceptions import OutputDuplicationError from dvc.repo import NotDvcRepoError, Repo, locked -from dvc_objects.hash_info import HashInfo +from dvc_objects.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 155b8417b..b7acfd33f 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.dvcfile import PIPELINE_FILE, Dvcfile from dvc.stage import PipelineStage, create_stage from dvc.stage.loader import StageLoader from dvc.stage.serialize import split_params_deps -from dvc_objects.hash_info import HashInfo +from dvc_objects.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 d48334809..576a19993 100644 --- a/tests/unit/stage/test_serialize_pipeline_lock.py +++ b/tests/unit/stage/test_serialize_pipeline_lock.py @@ -11,7 +11,7 @@ from dvc.stage.serialize import ( to_single_stage_lockfile as _to_single_stage_lockfile, ) from dvc.stage.utils import split_params_deps -from dvc_objects.hash_info import HashInfo +from dvc_objects.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 47e635076..9dd9ac8ca 100644 --- a/tests/unit/test_hashinfo.py +++ b/tests/unit/test_hashinfo.py @@ -1,4 +1,4 @@ -from dvc_objects.hash_info import HashInfo +from dvc_objects.hashfile.hash_info import HashInfo def test_as_raw():