Skip to content

Commit

Permalink
Merge pull request #626 from maresb/fix-update
Browse files Browse the repository at this point in the history
Fix conda-lock --update --micromamba
  • Loading branch information
maresb committed Apr 26, 2024
2 parents 3ed4606 + e106354 commit 75c525e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
1 change: 1 addition & 0 deletions conda_lock/conda_lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,7 @@ def run_lock(
_conda_exe = determine_conda_executable(
conda_exe, mamba=mamba, micromamba=micromamba
)
logger.debug(f"Using conda executable: {_conda_exe}")
make_lock_files(
conda=_conda_exe,
src_files=environment_files,
Expand Down
5 changes: 1 addition & 4 deletions conda_lock/conda_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -493,10 +493,7 @@ def update_specs_for_arch(
for package in set(installed).difference(updated):
entry = installed[package]
fn = f'{entry["dist_name"]}.tar.bz2'
if is_micromamba(conda):
channel = f'{entry["base_url"]}'
else:
channel = f'{entry["base_url"]}/{entry["platform"]}'
channel = f'{entry["base_url"]}/{entry["platform"]}'
url = f"{channel}/{fn}"
md5 = locked[package].hash.md5
if md5 is None:
Expand Down

0 comments on commit 75c525e

Please sign in to comment.