diff --git a/src/poetry/repositories/http_repository.py b/src/poetry/repositories/http_repository.py index ae96481a71d..9427d72bfe7 100644 --- a/src/poetry/repositories/http_repository.py +++ b/src/poetry/repositories/http_repository.py @@ -76,15 +76,11 @@ def _download(self, url: str, dest: Path) -> None: @contextmanager def _cached_or_downloaded_file(self, link: Link) -> Iterator[Path]: - filepath = self._authenticator.get_cached_file_for_url(link.url) - if filepath: + self._log(f"Downloading: {link.url}", level="debug") + with temporary_directory() as temp_dir: + filepath = Path(temp_dir) / link.filename + self._download(link.url, filepath) yield filepath - else: - self._log(f"Downloading: {link.url}", level="debug") - with temporary_directory() as temp_dir: - filepath = Path(temp_dir) / link.filename - self._download(link.url, filepath) - yield filepath def _get_info_from_wheel(self, url: str) -> PackageInfo: from poetry.inspection.info import PackageInfo diff --git a/src/poetry/utils/authenticator.py b/src/poetry/utils/authenticator.py index beb20342ca8..edf6fe073e4 100644 --- a/src/poetry/utils/authenticator.py +++ b/src/poetry/utils/authenticator.py @@ -19,7 +19,6 @@ from cachecontrol import CacheControlAdapter from cachecontrol.caches import FileCache -from cachecontrol.caches.file_cache import url_to_file_path from filelock import FileLock from poetry.config.config import Config @@ -464,13 +463,6 @@ def _get_certs_for_url(self, url: str) -> RepositoryCertificateConfig: return selected.certs(config=self._config) return RepositoryCertificateConfig() - def get_cached_file_for_url(self, url: str) -> Path | None: - if self._cache_control is None: - return None - - path = Path(url_to_file_path(url, self._cache_control)) - return path if path.exists() else None - _authenticator: Authenticator | None = None diff --git a/tests/utils/test_authenticator.py b/tests/utils/test_authenticator.py index 335e2b50c1e..2a0d1bee564 100644 --- a/tests/utils/test_authenticator.py +++ b/tests/utils/test_authenticator.py @@ -627,22 +627,6 @@ def test_authenticator_git_repositories( assert not three.password -def test_authenticator_get_cached_file_for_url__cache_miss(config: Config) -> None: - authenticator = Authenticator(config, NullIO()) - assert ( - authenticator.get_cached_file_for_url("https://foo.bar/cache/miss.whl") is None - ) - - -def test_authenticator_get_cached_file_for_url__cache_hit(config: Config) -> None: - authenticator = Authenticator(config, NullIO()) - url = "https://foo.bar/files/foo-0.1.0.tar.gz" - - authenticator._cache_control.set(url, b"hello") - - assert authenticator.get_cached_file_for_url(url) - - @pytest.mark.parametrize( ("ca_cert", "client_cert", "result"), [