diff --git a/dvc/dependency/repo.py b/dvc/dependency/repo.py index 92b368203..d187469bd 100644 --- a/dvc/dependency/repo.py +++ b/dvc/dependency/repo.py @@ -48,6 +48,7 @@ class RepoDependency(Dependency): url=self.def_repo[self.PARAM_URL], rev=self._get_rev(), ) + self.fs_path = self.def_path def _parse_path(self, fs, fs_path): # noqa: ARG002 return None diff --git a/dvc/repo/graph.py b/dvc/repo/graph.py index 34aecd25d..b19677503 100644 --- a/dvc/repo/graph.py +++ b/dvc/repo/graph.py @@ -110,10 +110,10 @@ def build_graph(stages, outs_trie=None): # Building graph graph.add_nodes_from(stages) for stage in stages: - for dep in stage.deps: - if dep.fs_path is None: - continue + if stage.is_repo_import: + continue + for dep in stage.deps: dep_key = dep.fs.path.parts(dep.fs_path) overlapping = [n.value for n in outs_trie.prefixes(dep_key)] if outs_trie.has_subtrie(dep_key): diff --git a/dvc/utils/strictyaml.py b/dvc/utils/strictyaml.py index a99e0569f..313818169 100644 --- a/dvc/utils/strictyaml.py +++ b/dvc/utils/strictyaml.py @@ -177,8 +177,8 @@ def determine_linecol( value = get(data, paths, default=None) if value is not None: with suppress(AttributeError, TypeError): - line = value.lc.line + 1 - col = value.lc.col + 1 + line = value.lc.line + 1 # type: ignore[attr-defined] + col = value.lc.col + 1 # type: ignore[attr-defined] break step += 1 *paths, _ = paths diff --git a/pyproject.toml b/pyproject.toml index 11f510e9f..0f7c53e51 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>=0.45.1,<0.46", + "dvc-data>=0.46.0,<0.47", "dvc-http", "dvc-render>=0.3.1,<0.4.0", "dvc-studio-client>=0.5.0,<1",