Merge pull request #747 from maresb/channel-cleanup

Channel cleanup

conda_lock/conda_solver.py

@@ -34,7 +34,7 @@
 )
 from conda_lock.lockfile import apply_categories
 from conda_lock.lockfile.v2prelim.models import HashModel, LockedDependency
-from conda_lock.models.channel import Channel
+from conda_lock.models.channel import Channel, normalize_url_with_placeholders
 from conda_lock.models.lock_spec import Dependency, VersionedDependency
 
 
@@ -171,17 +171,6 @@ def solve_conda(
         )
     logging.debug("dry_run_install:\n%s", dry_run_install)
 
-    def normalize_url(url: str) -> str:
-        for channel in channels:
-            candidate1 = channel.conda_token_replaced_url()
-            if url.startswith(candidate1):
-                url = url.replace(candidate1, channel.url, 1)
-
-            candidate2 = channel.env_replaced_url()
-            if url.startswith(candidate2):
-                url = url.replace(candidate2, channel.url, 1)
-        return url
-
     # extract dependencies from package plan
     planned = {}
     for action in dry_run_install["actions"]["FETCH"]:
@@ -201,7 +190,7 @@ def normalize_url(url: str) -> str:
             platform=platform,
             dependencies=dependencies,
             # TODO: Normalize URL here and inject env vars
-            url=normalize_url(action["url"]),
+            url=normalize_url_with_placeholders(action["url"], channels=channels),
             # NB: virtual packages may have no hash
             hash=HashModel(
                 md5=action["md5"] if "md5" in action else "",
@@ -264,8 +253,8 @@ def _get_pkgs_dirs(
     env = conda_env_override(platform)
     output = subprocess.check_output(args, env=env).decode()
     json_object_str = extract_json_object(output)
-    json_object: dict[str, Any] = json.loads(json_object_str)
-    pkgs_dirs_list: list[str]
+    json_object: Dict[str, Any] = json.loads(json_object_str)
+    pkgs_dirs_list: List[str]
     if "pkgs_dirs" in json_object:
         pkgs_dirs_list = json_object["pkgs_dirs"]
     elif "package cache" in json_object:

conda_lock/interfaces/vendored_conda.py

@@ -1,5 +1,9 @@
 from conda_lock._vendor.conda.common.toposort import toposort
+from conda_lock._vendor.conda.common.url import (
+    mask_anaconda_token,
+    split_anaconda_token,
+)
 from conda_lock._vendor.conda.models.match_spec import MatchSpec
 
 
-__all__ = ["toposort", "MatchSpec"]
+__all__ = ["toposort", "MatchSpec", "mask_anaconda_token", "split_anaconda_token"]

conda_lock/invoke_conda.py

@@ -8,6 +8,7 @@
 import tempfile
 import threading
 
+from logging import getLogger
 from typing import IO, Dict, Iterator, List, Optional, Sequence, Union
 
 from ensureconda.api import determine_micromamba_version, ensureconda
@@ -16,6 +17,8 @@
 from conda_lock.models.channel import Channel
 
 
+logger = getLogger(__name__)
+
 PathLike = Union[str, pathlib.Path]
 
 CONDA_PKGS_DIRS: Optional[str] = None
@@ -106,6 +109,7 @@ def _invoke_conda(
         common_args.extend(shlex.split(conda_flags))
 
     cmd = [str(arg) for arg in [conda, *command_args, *common_args, *post_args]]
+    logger.debug(f"Invoking command: {shlex.join(cmd)}")
 
     with subprocess.Popen(
         cmd,

conda_lock/lockfile/v1/models.py

@@ -127,9 +127,9 @@ def create(
         except ImportError:
             return None
 
-        git_sha: str | None = None
-        git_user_name: str | None = None
-        git_user_email: str | None = None
+        git_sha: Optional[str] = None
+        git_user_name: Optional[str] = None
+        git_user_email: Optional[str] = None
 
         try:
             repo = git.Repo(search_parent_directories=True)