From 1bbfa5ca351f4ee8f0a37fd69a5d1ad0c99fe954 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 7 Jan 2018 10:33:42 +0200 Subject: [PATCH] dvc: cleanup artifacts from #382 Signed-off-by: Ruslan Kuprieiev --- dvc/cache.py | 2 +- dvc/project.py | 7 ------- dvc/stage.py | 4 ---- dvc/state.py | 2 -- dvc/system.py | 7 +++---- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dvc/cache.py b/dvc/cache.py index 118c61eb4..feec198f7 100644 --- a/dvc/cache.py +++ b/dvc/cache.py @@ -30,7 +30,7 @@ class Cache(object): file_set = set(files) cached = {} for cache_file in self.all(): - cached_files = list(filter(lambda f: System.samefile(cache_file, f, True), file_set)) + cached_files = list(filter(lambda f: System.samefile(cache_file, f), file_set)) cached.update(dict((f, os.path.basename(cache_file)) for f in cached_files)) file_set = file_set - set(cached_files) return cached diff --git a/dvc/project.py b/dvc/project.py index 64b13c4b2..e77541af2 100644 --- a/dvc/project.py +++ b/dvc/project.py @@ -233,13 +233,6 @@ class Project(object): return G - def all_directions(self): - result = [] - for stage in self.stages(): - for dep in stage.deps + stage.outs: - result.append((stage, dep)) - return result - def stages(self): stages = [] for root, dirs, files in os.walk(self.root_dir): diff --git a/dvc/stage.py b/dvc/stage.py index dcad68e9b..e11fcc0ce 100644 --- a/dvc/stage.py +++ b/dvc/stage.py @@ -58,10 +58,6 @@ class Output(object): def dvc_path(self): return os.path.relpath(self.path, self.project.root_dir) - @property - def dvc_path(self): - return os.path.relpath(self.path, self.project.root_dir) - def _changed_md5(self): if not os.path.exists(self.path): return True diff --git a/dvc/state.py b/dvc/state.py index 4be003877..ddd579e92 100644 --- a/dvc/state.py +++ b/dvc/state.py @@ -54,7 +54,6 @@ class State(object): return State(root_dir, dvc_dir) def update(self, path, md5, mtime): - mtime = int(mtime) existing = self.get(path) if not existing: return self.add(path, md5, mtime) @@ -65,7 +64,6 @@ class State(object): return state def add(self, path, md5, mtime): - mtime = int(mtime) entry = StateEntry(self.root_dir, path, md5, mtime) self._db.insert(entry.dumpd()) return entry diff --git a/dvc/system.py b/dvc/system.py index b8b0c8098..28cfb3a03 100644 --- a/dvc/system.py +++ b/dvc/system.py @@ -26,10 +26,9 @@ class System(object): return winlink.create(source, link_name) @staticmethod - def samefile(path1, path2, check_exist=False): - if check_exist: - if not os.path.exists(path1) or not os.path.exists(path2): - return False + def samefile(path1, path2): + if not os.path.exists(path1) or not os.path.exists(path2): + return False if System.is_unix(): return os.path.samefile(path1, path2)