diff --git a/poetry/installation/pip_installer.py b/poetry/installation/pip_installer.py index 336072e36fa..a65d7670f38 100644 --- a/poetry/installation/pip_installer.py +++ b/poetry/installation/pip_installer.py @@ -11,9 +11,9 @@ from poetry.repositories.pool import Pool from poetry.utils._compat import Path from poetry.utils._compat import encode -from poetry.utils.cache import DownloadCache from poetry.utils.env import Env from poetry.utils.helpers import safe_rmtree +from poetry.utils.temp import DownloadTmpDir from .base_installer import BaseInstaller @@ -236,7 +236,9 @@ def install_git(self, package): from poetry.vcs import Git src_dir = self._env.path / "src" / package.name - tmp_dir = Path(DownloadCache.mkcache(package.source_url, prefix="pypoetry-git")) + tmp_dir = Path( + DownloadTmpDir.mkcache(package.source_url, prefix="pypoetry-git") + ) if src_dir.exists(): safe_rmtree(str(src_dir)) diff --git a/poetry/puzzle/provider.py b/poetry/puzzle/provider.py index 3cdcdb490c2..97dbd1e1559 100644 --- a/poetry/puzzle/provider.py +++ b/poetry/puzzle/provider.py @@ -33,7 +33,6 @@ from poetry.utils._compat import OrderedDict from poetry.utils._compat import Path from poetry.utils._compat import urlparse -from poetry.utils.cache import DownloadCache from poetry.utils.env import EnvCommandError from poetry.utils.env import EnvManager from poetry.utils.env import VirtualEnv @@ -41,6 +40,7 @@ from poetry.utils.helpers import temporary_directory from poetry.utils.inspector import Inspector from poetry.utils.setup_reader import SetupReader +from poetry.utils.temp import DownloadTmpDir from poetry.utils.toml_file import TomlFile from poetry.vcs.git import Git from poetry.version.markers import MarkerUnion @@ -186,7 +186,7 @@ def get_package_from_vcs( if vcs != "git": raise ValueError("Unsupported VCS dependency {}".format(vcs)) - tmp_dir = Path(DownloadCache.mkcache(url, prefix="pypoetry-git")) + tmp_dir = Path(DownloadTmpDir.mkcache(url, prefix="pypoetry-git")) git = Git() diff --git a/poetry/utils/cache.py b/poetry/utils/temp.py similarity index 53% rename from poetry/utils/cache.py rename to poetry/utils/temp.py index 99f57d15d39..da65735b79f 100644 --- a/poetry/utils/cache.py +++ b/poetry/utils/temp.py @@ -11,17 +11,17 @@ def force_rm(action, name, exc): @atexit.register -def cleanup_caches(): - for source, cache in DownloadCache.cache_dirs.items(): +def cleanup_tmp(): + for source, cache in DownloadTmpDir.tmp_dirs.items(): shutil.rmtree(cache, onerror=force_rm) -class DownloadCache: - cache_dirs = {} +class DownloadTmpDir: + tmp_dirs = {} @classmethod def mkcache(cls, source, suffix="", prefix="", dir=""): - if source not in cls.cache_dirs: - cls.cache_dirs[source] = mkdtemp(suffix, prefix, dir) + if source not in cls.tmp_dirs: + cls.tmp_dirs[source] = mkdtemp(suffix, prefix, dir) - return cls.cache_dirs[source] + return cls.tmp_dirs[source]