Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpin mamba<2 in dev environment #724

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open

Unpin mamba<2 in dev environment #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3de5b07
Revert "Pin mamba<2 in dev environment"
maresb Oct 4, 2024
e9bf944
Move types-click-default-group out of pip deps
maresb Nov 6, 2024
188d652
Relock conda dependencies
maresb Dec 15, 2024
bc75f09
Relock pixi dependencies
maresb Dec 15, 2024
0a1e1c0
Break apart compound command in test
maresb Dec 15, 2024
30d7dcf
Define a fake Python binary in fake Conda env
maresb Dec 15, 2024
2e4dd4a
Try to handle Windows in making the fake python
maresb Dec 15, 2024
d2427b9
Try copying Windows executable
maresb Dec 16, 2024
53ee861
More robust test reporting
maresb Dec 16, 2024
c504ed8
Relock conda dependencies
maresb Feb 2, 2025
ce5f223
Add prerelease labels
maresb Feb 3, 2025
24865fb
Force mamba to prerelease
maresb Feb 3, 2025
17870b1
Relock conda dependencies
maresb Feb 3, 2025
cc1a813
Update pixi.toml
maresb Feb 3, 2025
a1a7833
Revert "Try copying Windows executable"
maresb Feb 3, 2025
fa1f835
Revert "Try to handle Windows in making the fake python"
maresb Feb 3, 2025
b2da4bf
Revert "Define a fake Python binary in fake Conda env"
maresb Feb 3, 2025
877fa33
Use `--no-pip` in `fake_conda_environment`
maresb Feb 3, 2025
4ae6924
Fix channel order
maresb Feb 3, 2025
dd71845
Update pixi.toml
maresb Feb 3, 2025
1fc52f9
Relock dependencies
maresb Feb 3, 2025
e29c7d1
Log the update command
maresb Feb 3, 2025
c57de42
Log executable version
maresb Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions conda_lock/conda_lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import pathlib
import posixpath
import re
import subprocess
import sys
import tempfile

Expand Down Expand Up @@ -1154,6 +1155,11 @@ def run_lock(
conda_exe, mamba=mamba, micromamba=micromamba
)
logger.debug(f"Using conda executable: {_conda_exe}")
version_info = subprocess.check_output(
[_conda_exe, "--version"], encoding="utf-8"
).strip()
logger.debug(f"Executable has version: {version_info}")

make_lock_files(
conda=_conda_exe,
src_files=environment_files,
Expand Down
12 changes: 7 additions & 5 deletions conda_lock/conda_solver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ def update_specs_for_arch(
entry["name"]: entry
for entry in json.loads(
subprocess.check_output(
[str(conda), "list", "-p", prefix, "--json"],
[str(conda), "list", "--no-pip", "-p", prefix, "--json"],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that --no-pip is new in mamba v2.0.6. We need to figure out how to handle the cases mamba >=2,<2.0.6 and mamba <2.

env=conda_env_override(platform),
)
)
Expand Down Expand Up @@ -469,11 +469,13 @@ def update_specs_for_arch(
"update" if is_micromamba(conda) else "install",
*_get_conda_flags(channels=channels, platform=platform),
]
cmd = [
str(arg)
for arg in [*args, "-p", prefix, "--json", "--dry-run", *to_update]
]
logger.debug(f"Running command {shlex.join(cmd)}")
proc = subprocess.run( # noqa: UP022 # Poetry monkeypatch breaks capture_output
[
str(arg)
for arg in [*args, "-p", prefix, "--json", "--dry-run", *to_update]
],
cmd,
env=conda_env_override(platform),
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
Expand Down
Loading
Loading