Skip to content

Commit

Permalink
Merge pull request #721 from maresb/revert-final-micromamba-v2-workar…
Browse files Browse the repository at this point in the history
…ound

Revert one of the micromamba v2 workarounds
  • Loading branch information
maresb authored Oct 3, 2024
2 parents 17a337d + 5825041 commit eb70f10
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions tests/test_conda_lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -2594,20 +2594,13 @@ def test_fake_conda_env(conda_exe: str, conda_lock_yaml: Path):
expected_channel = "conda-forge"
expected_base_url = "https://conda.anaconda.org/conda-forge"
if is_micromamba(conda_exe):
dist_name = env_package["dist_name"]
assert env_package["base_url"] in {
f"{expected_base_url}/{platform}",
expected_base_url,
# <https://github.com/mamba-org/mamba/issues/3480>
f"{expected_base_url}/{platform}/{dist_name}.conda",
f"{expected_base_url}/{platform}/{dist_name}.tar.bz2",
}
assert env_package["channel"] in {
f"{expected_channel}/{platform}",
expected_channel,
# <https://github.com/mamba-org/mamba/issues/3480>
f"{expected_channel}/{platform}/{dist_name}.conda",
f"{expected_channel}/{platform}/{dist_name}.tar.bz2",
}
else:
assert env_package["base_url"] == expected_base_url
Expand Down

0 comments on commit eb70f10

Please sign in to comment.