From f01acd377c1c0ced6f293c44aacafc367d616619 Mon Sep 17 00:00:00 2001 From: SrividyaKK Date: Wed, 23 Oct 2019 05:37:20 +0530 Subject: [PATCH 1/3] Added path.lstrip for / in imports --- dvc/repo/get.py | 1 + dvc/repo/imp.py | 1 + 2 files changed, 2 insertions(+) diff --git a/dvc/repo/get.py b/dvc/repo/get.py index 9096216c9d..258f6d8840 100644 --- a/dvc/repo/get.py +++ b/dvc/repo/get.py @@ -21,6 +21,7 @@ @staticmethod def get(url, path, out=None, rev=None): out = resolve_output(path, out) + path = path.lstrip("/") if Stage.is_valid_filename(out): raise GetDVCFileError() diff --git a/dvc/repo/imp.py b/dvc/repo/imp.py index 68ead389b6..270d4caa6a 100644 --- a/dvc/repo/imp.py +++ b/dvc/repo/imp.py @@ -2,5 +2,6 @@ def imp(self, url, path, out=None, rev=None): erepo = {"url": url} if rev is not None: erepo["rev"] = rev + path = path.lstrip("/") return self.imp_url(path, out=out, erepo=erepo, locked=True) From 81b5dd66e7cd7b94a920d0ec0fbaf39b2f98dd30 Mon Sep 17 00:00:00 2001 From: SrividyaKK Date: Fri, 25 Oct 2019 12:24:00 +0530 Subject: [PATCH 2/3] Postorder traversal - pipeline list --- dvc/command/pipeline.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dvc/command/pipeline.py b/dvc/command/pipeline.py index 2806994797..5617c0a7f6 100644 --- a/dvc/command/pipeline.py +++ b/dvc/command/pipeline.py @@ -162,13 +162,19 @@ def run(self): class CmdPipelineList(CmdBase): def run(self): - import networkx + import networkx as nx pipelines = self.repo.pipelines for p in pipelines: - stages = networkx.get_node_attributes(p, "stage") - for stage in stages: - logger.info(stage) + active = p.copy() + stages = nx.get_node_attributes(p, "stage") + for node in p: + stage = stages[node] + # if not stage.locked: + # continue + for n in nx.dfs_postorder_nodes(p, node): + if n == node: + logger.info(stage) if len(stages) != 0: logger.info("=" * 80) logger.info("{} pipelines total".format(len(pipelines))) From 9d13d0c439d71f653a2738043c647ceeadecd7bd Mon Sep 17 00:00:00 2001 From: SrividyaKK Date: Fri, 25 Oct 2019 12:24:19 +0530 Subject: [PATCH 3/3] Postorder traversal - pipeline list --- dvc/command/pipeline.py | 1 - 1 file changed, 1 deletion(-) diff --git a/dvc/command/pipeline.py b/dvc/command/pipeline.py index 5617c0a7f6..1ed71e2df7 100644 --- a/dvc/command/pipeline.py +++ b/dvc/command/pipeline.py @@ -166,7 +166,6 @@ def run(self): pipelines = self.repo.pipelines for p in pipelines: - active = p.copy() stages = nx.get_node_attributes(p, "stage") for node in p: stage = stages[node]