From 1b3f8a20835b5f554b5dc1b2efb9f087903c78b8 Mon Sep 17 00:00:00 2001 From: Daniel Holth Date: Mon, 31 Jul 2023 09:46:04 -0400 Subject: [PATCH] remove cache_path_* arguments (#12927) * remove cache_path_* arguments * add news * remove unused import --- conda/gateways/repodata/__init__.py | 2 -- conda/gateways/repodata/jlap/interface.py | 8 -------- news/12927-remove-unused-cache-path-arguments | 20 +++++++++++++++++++ 3 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 news/12927-remove-unused-cache-path-arguments diff --git a/conda/gateways/repodata/__init__.py b/conda/gateways/repodata/__init__.py index 9dfa45aaae3..a9a326f346e 100644 --- a/conda/gateways/repodata/__init__.py +++ b/conda/gateways/repodata/__init__.py @@ -805,8 +805,6 @@ def _repo(self) -> RepoInterface: return self.repo_interface_cls( self.url_w_credentials, repodata_fn=self.repodata_fn, - cache_path_json=self.cache_path_json, - cache_path_state=self.cache_path_state, cache=self.repo_cache, ) diff --git a/conda/gateways/repodata/jlap/interface.py b/conda/gateways/repodata/jlap/interface.py index 4bfefaa1162..a5a4306f171 100644 --- a/conda/gateways/repodata/jlap/interface.py +++ b/conda/gateways/repodata/jlap/interface.py @@ -5,7 +5,6 @@ import logging import os -from pathlib import Path from conda.base.context import context from conda.gateways.connection.download import disable_ssl_verify_warning @@ -34,18 +33,11 @@ def __init__( url: str, repodata_fn: str | None, *, - cache_path_json: str | Path, - cache_path_state: str | Path, cache: RepodataCache, **kwargs, ) -> None: log.debug("Using CondaRepoJLAP") - # TODO is there a better way to share these paths - self._cache_path_json = Path(cache_path_json) - self._cache_path_state = Path(cache_path_state) - - # replaces self._cache_path_json/state self._cache = cache self._url = url diff --git a/news/12927-remove-unused-cache-path-arguments b/news/12927-remove-unused-cache-path-arguments new file mode 100644 index 00000000000..891f99ee81a --- /dev/null +++ b/news/12927-remove-unused-cache-path-arguments @@ -0,0 +1,20 @@ +### Enhancements + +* + +### Bug fixes + +* + +### Deprecations + +* + +### Docs + +* + +### Other + +* Remove unused cache_path arguments from RepoInterface/JlapRepoInterface; + replaced by cache object. (#12927)