From 7e3e257c7f58a80e2dbb5a2afdd83ab6f9f447ae Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 10 Nov 2021 22:54:26 +0200 Subject: [PATCH] utils: fs: remove unused fs_copy --- dvc/utils/fs.py | 7 ------- tests/dir_helpers.py | 12 ++++++++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dvc/utils/fs.py b/dvc/utils/fs.py index ff90295b3..fdb89e597 100644 --- a/dvc/utils/fs.py +++ b/dvc/utils/fs.py @@ -22,13 +22,6 @@ umask = os.umask(0) os.umask(umask) -def fs_copy(src, dst, ignore=None): - if os.path.isdir(src): - shutil.copytree(src, dst, ignore=ignore) - else: - shutil.copy2(src, dst) - - def get_inode(path): inode = System.inode(path) logger.trace("Path '%s' inode '%d'", path, inode) diff --git a/tests/dir_helpers.py b/tests/dir_helpers.py index e876cf0c6..6b26c302e 100644 --- a/tests/dir_helpers.py +++ b/tests/dir_helpers.py @@ -290,6 +290,15 @@ class PosixTmpDir(TmpDir, pathlib.PurePosixPath): CACHE = {} +def _fs_copy(src, dst, ignore=None): + import shutil + + if os.path.isdir(src): + shutil.copytree(src, dst, ignore=ignore) + else: + shutil.copy2(src, dst) + + @pytest.fixture(scope="session") def make_tmp_dir(tmp_path_factory, request, worker_id): def make(name, *, scm=False, dvc=False, subdir=False): @@ -297,7 +306,6 @@ def make_tmp_dir(tmp_path_factory, request, worker_id): from dvc.repo import Repo from dvc.scm.git import Git - from dvc.utils.fs import fs_copy cache = CACHE.get((scm, dvc, subdir)) if not cache: @@ -311,7 +319,7 @@ def make_tmp_dir(tmp_path_factory, request, worker_id): ignore = ignore_patterns("cache.db*") for entry in os.listdir(cache): # shutil.copytree's dirs_exist_ok is only available in >=3.8 - fs_copy( + _fs_copy( os.path.join(cache, entry), os.path.join(path, entry), ignore=ignore,