From 5c1748c15c43c04aae5746b3fa879ec26044fbf0 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Tue, 29 May 2018 01:55:42 +0300 Subject: [PATCH] outs/deps: remove loads method Signed-off-by: Ruslan Kuprieiev --- dvc/dependency/__init__.py | 2 +- dvc/dependency/base.py | 4 ---- dvc/dependency/local.py | 4 ---- dvc/dependency/s3.py | 4 ---- dvc/output/__init__.py | 2 +- dvc/output/gs.py | 6 ------ dvc/output/local.py | 6 ------ dvc/output/s3.py | 6 ------ 8 files changed, 2 insertions(+), 32 deletions(-) diff --git a/dvc/dependency/__init__.py b/dvc/dependency/__init__.py index 131ee2dc4..ae08a6eca 100644 --- a/dvc/dependency/__init__.py +++ b/dvc/dependency/__init__.py @@ -35,5 +35,5 @@ def loadd_from(stage, d_list): def loads_from(stage, s_list): ret = [] for s in s_list: - ret.append(_get(s).loads(stage, s)) + ret.append(_get(s)(stage, s)) return ret diff --git a/dvc/dependency/base.py b/dvc/dependency/base.py index 017a2b64d..171c9819a 100644 --- a/dvc/dependency/base.py +++ b/dvc/dependency/base.py @@ -61,7 +61,3 @@ class DependencyBase(object): def loadd(cls, stage, d): path = d[cls.PARAM_PATH] return cls(stage, path) - - @classmethod - def loads(cls, stage, s): - return cls(stage, s) diff --git a/dvc/dependency/local.py b/dvc/dependency/local.py index 708be27ea..97dc37c1c 100644 --- a/dvc/dependency/local.py +++ b/dvc/dependency/local.py @@ -86,7 +86,3 @@ class DependencyLOCAL(DependencyBase): path = os.path.normpath(path) md5 = d.get(cls.PARAM_MD5, None) return cls(stage, path, md5=md5) - - @classmethod - def loads(cls, stage, s): - return cls(stage, os.path.join(stage.cwd, s), md5=None) diff --git a/dvc/dependency/s3.py b/dvc/dependency/s3.py index 17f9dfa1e..522730978 100644 --- a/dvc/dependency/s3.py +++ b/dvc/dependency/s3.py @@ -54,7 +54,3 @@ class DependencyS3(DependencyBase): path = d[cls.PARAM_PATH] etag = d.get(cls.PARAM_ETAG, None) return cls(stage, path, etag=etag) - - @classmethod - def loads(cls, stage, s): - return cls(stage, s, etag=None) diff --git a/dvc/output/__init__.py b/dvc/output/__init__.py index 23dd3b542..5139af482 100644 --- a/dvc/output/__init__.py +++ b/dvc/output/__init__.py @@ -33,5 +33,5 @@ def loadd_from(stage, d_list): def loads_from(stage, s_list, use_cache=False): ret = [] for s in s_list: - ret.append(_get(s).loads(stage, s, use_cache=use_cache)) + ret.append(_get(s)(stage, s, use_cache=use_cache)) return ret diff --git a/dvc/output/gs.py b/dvc/output/gs.py index d69d31d10..3a89e7e7f 100644 --- a/dvc/output/gs.py +++ b/dvc/output/gs.py @@ -28,12 +28,6 @@ class OutputGS(DependencyGS): ret.use_cache = d.get(cls.PARAM_CACHE, True) return ret - @classmethod - def loads(cls, stage, s, use_cache=True): - ret = super(OutputGS, cls).loads(stage, s) - ret.use_cache = use_cache - return ret - def changed(self): if super(OutputGS, self).changed(): return True diff --git a/dvc/output/local.py b/dvc/output/local.py index 6b8b080b3..2f761f547 100644 --- a/dvc/output/local.py +++ b/dvc/output/local.py @@ -38,12 +38,6 @@ class OutputLOCAL(DependencyLOCAL): ret.use_cache = d.get(cls.PARAM_CACHE, True) return ret - @classmethod - def loads(cls, stage, s, use_cache=True): - ret = super(OutputLOCAL, cls).loads(stage, s) - ret.use_cache = use_cache - return ret - def changed(self): if super(OutputLOCAL, self).changed(): return True diff --git a/dvc/output/s3.py b/dvc/output/s3.py index 0216010a5..b5df0feca 100644 --- a/dvc/output/s3.py +++ b/dvc/output/s3.py @@ -28,12 +28,6 @@ class OutputS3(DependencyS3): ret.use_cache = d.get(cls.PARAM_CACHE, True) return ret - @classmethod - def loads(cls, stage, s, use_cache=True): - ret = super(OutputS3, cls).loads(stage, s) - ret.use_cache = use_cache - return ret - def changed(self): if super(OutputS3, self).changed(): return True