From 2f6c308c844366f24d90aeb0cd8e386cc4999db9 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Tue, 4 Jul 2023 16:18:36 +0300 Subject: [PATCH] repo: site_cache_dir: take major version into account So that different major dvc versions don't use the same cache path. --- dvc/repo/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dvc/repo/__init__.py b/dvc/repo/__init__.py index 6c50c5f32..544fd1f69 100644 --- a/dvc/repo/__init__.py +++ b/dvc/repo/__init__.py @@ -557,6 +557,7 @@ class Repo: from dvc.dirs import site_cache_dir from dvc.fs import GitFileSystem + from dvc.version import version_tuple cache_dir = self.config["core"].get("site_cache_dir") or site_cache_dir() @@ -578,7 +579,13 @@ class Repo: os.umask(umask) md5 = hashlib.md5( # noqa: S324 # nosec B324, B303 - str((root_dir, getpass.getuser())).encode() + str( + ( + root_dir, + getpass.getuser(), + version_tuple[0], + ) + ).encode() ) repo_token = md5.hexdigest() return os.path.join(repos_dir, repo_token)