diff --git a/dvc/output.py b/dvc/output.py index 5cf213300..2146e60b5 100644 --- a/dvc/output.py +++ b/dvc/output.py @@ -44,7 +44,6 @@ from .utils.fs import path_isin if TYPE_CHECKING: from dvc_data.hashfile.obj import HashFile from dvc_data.index import DataIndexKey - from dvc_objects.db import ObjectDB from .ignore import DvcIgnoreFilter @@ -1163,7 +1162,7 @@ class Output: def get_used_objs( # noqa: C901 self, **kwargs - ) -> Dict[Optional["ObjectDB"], Set["HashInfo"]]: + ) -> Dict[Optional["HashFileDB"], Set["HashInfo"]]: """Return filtered set of used object IDs for this out.""" if not self.use_cache: diff --git a/dvc/repo/gc.py b/dvc/repo/gc.py index 3b186bf1c..28a5361b4 100644 --- a/dvc/repo/gc.py +++ b/dvc/repo/gc.py @@ -7,8 +7,8 @@ from . import locked if TYPE_CHECKING: from dvc.repo import Repo + from dvc_data.hashfile.db import HashFileDB from dvc_data.hashfile.hash_info import HashInfo - from dvc_objects.db import ObjectDB logger = logging.getLogger(__name__) @@ -92,7 +92,7 @@ def gc( # noqa: PLR0912, PLR0913, C901 repos = [] all_repos = [Repo(path) for path in repos] - odb_to_obj_ids: List[Tuple[Optional["ObjectDB"], Set["HashInfo"]]] = [] + odb_to_obj_ids: List[Tuple[Optional["HashFileDB"], Set["HashInfo"]]] = [] with ExitStack() as stack: for repo in all_repos: diff --git a/dvc/repo/index.py b/dvc/repo/index.py index 85df2a937..e9d39ac87 100644 --- a/dvc/repo/index.py +++ b/dvc/repo/index.py @@ -33,14 +33,14 @@ if TYPE_CHECKING: from dvc.repo.stage import StageInfo from dvc.stage import Stage from dvc.types import TargetType + from dvc_data.hashfile.db import HashFileDB from dvc_data.hashfile.hash_info import HashInfo from dvc_data.index import DataIndex, DataIndexKey, DataIndexView - from dvc_objects.db import ObjectDB from dvc_objects.fs.base import FileSystem logger = logging.getLogger(__name__) -ObjectContainer = Dict[Optional["ObjectDB"], Set["HashInfo"]] +ObjectContainer = Dict[Optional["HashFileDB"], Set["HashInfo"]] def log_walk(seq): diff --git a/dvc/stage/__init__.py b/dvc/stage/__init__.py index f51e6f636..ef5b6ab8b 100644 --- a/dvc/stage/__init__.py +++ b/dvc/stage/__init__.py @@ -48,6 +48,7 @@ if TYPE_CHECKING: from dvc.output import Output from dvc.repo import Repo from dvc.types import StrPath + from dvc_data.hashfile.db import HashFileDB from dvc_data.hashfile.hash_info import HashInfo from dvc_objects.db import ObjectDB @@ -732,7 +733,7 @@ class Stage(params.StageParams): def get_used_objs( self, *args, **kwargs - ) -> Dict[Optional["ObjectDB"], Set["HashInfo"]]: + ) -> Dict[Optional["HashFileDB"], Set["HashInfo"]]: """Return set of object IDs used by this stage.""" if self.is_partial_import and not self.is_repo_import: return {} diff --git a/pyproject.toml b/pyproject.toml index 2fbcb3e85..3fd0de861 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ "configobj>=5.0.6", "distro>=1.3", "dpath<3,>=2.1.0", - "dvc-data>=2.16.0,<2.17.0", + "dvc-data>=2.16.3,<2.17.0", "dvc-http>=2.29.0", "dvc-render>=0.3.1,<1", "dvc-studio-client>=0.9.2,<1",