diff --git a/dvc/command/pipeline.py b/dvc/command/pipeline.py index 36a8a8958..4fd75ba6d 100644 --- a/dvc/command/pipeline.py +++ b/dvc/command/pipeline.py @@ -20,7 +20,7 @@ class CmdPipelineShow(CmdBase): self.project.logger.info(stages[n].cmd) elif outs: for out in stages[n].outs: - self.project.logger.info(out.rel_path) + self.project.logger.info(str(out)) else: self.project.logger.info(n) @@ -52,10 +52,10 @@ class CmdPipelineShow(CmdBase): elif outs: for from_out in from_stage.outs: for to_out in to_stage.outs: - nodes.add(from_out.rel_path) - nodes.add(to_out.rel_path) - edges.append((from_out.rel_path, - to_out.rel_path)) + nodes.add(str(from_out)) + nodes.add(str(to_out)) + edges.append((str(from_out), + str(to_out))) else: nodes.add(from_stage.relpath) nodes.add(to_stage.relpath) diff --git a/dvc/dependency/base.py b/dvc/dependency/base.py index 970fc540a..512c44621 100644 --- a/dvc/dependency/base.py +++ b/dvc/dependency/base.py @@ -31,6 +31,9 @@ class DependencyBase(object): self.project = stage.project self.path = path + def __str__(self): + return self.path + @classmethod def match(cls, url): return re.match(cls.REGEX, url) diff --git a/dvc/dependency/local.py b/dvc/dependency/local.py index c4ea5e9ba..3ff164121 100644 --- a/dvc/dependency/local.py +++ b/dvc/dependency/local.py @@ -38,6 +38,9 @@ class DependencyLOCAL(DependencyBase): self.path_info = {'scheme': 'local', 'path': self.path} + def __str__(self): + return self.rel_path + @property def sep(self): return os.sep