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

Add ability to specify channel overrides on the command line #49

Merged
merged 5 commits into from
Sep 10, 2020
Merged

Add ability to specify channel overrides on the command line #49

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22e7fb9
Add ability to specify channel overrides on the command line
mariusvniekerk Sep 10, 2020
4313fe6
Address code review comments
mariusvniekerk Sep 10, 2020
56b71b9
Fix conflicting argument
mariusvniekerk Sep 10, 2020
8acb9de
Improve type annotations
mariusvniekerk Sep 10, 2020
202e612
Simplify cli
mariusvniekerk Sep 10, 2020
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
50 changes: 42 additions & 8 deletions conda_lock/conda_lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
List,
MutableSequence,
Optional,
Sequence,
Set,
Tuple,
Union,
Expand All @@ -34,10 +35,7 @@
from conda_lock.src_parser import LockSpecification
from conda_lock.src_parser.environment_yaml import parse_environment_file
from conda_lock.src_parser.meta_yaml import parse_meta_yaml_file
from conda_lock.src_parser.pyproject_toml import (
parse_poetry_pyproject_toml,
parse_pyproject_toml,
)
from conda_lock.src_parser.pyproject_toml import parse_pyproject_toml


PathLike = Union[str, pathlib.Path]
Expand Down Expand Up @@ -164,7 +162,7 @@ def conda_env_override(platform) -> Dict[str, str]:


def solve_specs_for_arch(
conda: PathLike, channels: List[str], specs: List[str], platform: str
conda: PathLike, channels: Sequence[str], specs: List[str], platform: str
) -> dict:
args: MutableSequence[PathLike] = [
conda,
Expand Down Expand Up @@ -243,7 +241,7 @@ def search_for_md5s(conda: PathLike, package_specs: List[dict], platform: str):
if name in found:
continue
out = subprocess.run(
["conda", "search", "--use-index-cache", "--json", spec],
[conda, "search", "--use-index-cache", "--json", spec],
encoding="utf8",
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
Expand Down Expand Up @@ -271,7 +269,24 @@ def make_lock_files(
platforms: List[str],
src_file: pathlib.Path,
include_dev_dependencies: bool = True,
channel_overrides: Optional[Sequence[str]] = None,
):
"""Generate the lock files for the given platforms from the src file provided

Parameters
----------
conda :
The path to a conda or mamba executable
platforms :
List of platforms to generate the lock for
src_file :
Path to a supported source file type
include_dev_dependencies :
For source types that separate out dev dependencies from regular ones,include those, default True
channel_overrides :
Forced list of channels to use.

"""
for plat in platforms:
print(f"generating lockfile for {plat}", file=sys.stderr)
lock_spec = parse_source_file(
Expand All @@ -280,10 +295,15 @@ def make_lock_files(
include_dev_dependencies=include_dev_dependencies,
)

if channel_overrides is not None:
channels = channel_overrides
else:
channels = lock_spec.channels
mariusvniekerk marked this conversation as resolved.
Show resolved Hide resolved

dry_run_install = solve_specs_for_arch(
conda=conda,
platform=lock_spec.platform,
channels=lock_spec.channels,
channels=channels,
specs=lock_spec.specs,
)
with open(f"conda-{plat}.lock", "w") as fo:
Expand Down Expand Up @@ -355,7 +375,6 @@ def main_on_docker(env_file, platforms):
def parser():
parser = argparse.ArgumentParser()
parser.add_argument(
"-c",
"--conda",
default=None,
help="path (or name) of the conda/mamba executable to use.",
Expand All @@ -372,6 +391,18 @@ def parser():
action="append",
help="generate lock files for the following platforms",
)
parser.add_argument(
"-c",
"--channel",
dest="channel_overrides",
nargs="?",
action="append",
help="""
Override the channels to use when solving the environment. These will
replace the channels as listed in the various source files.
""",
)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you need a default value here too or args.channels is gonna raise down on line 469

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

changed the channels to allow None


group = parser.add_mutually_exclusive_group()
group.add_argument(
"--dev-dependencies",
Expand Down Expand Up @@ -424,13 +455,15 @@ def run_lock(
platforms: Optional[List[str]] = None,
no_mamba: bool = False,
include_dev_dependencies: bool = True,
channel_overrides: Optional[Sequence[str]] = None,
) -> None:
_conda_exe = ensure_conda(conda_exe, no_mamba=no_mamba)
make_lock_files(
conda=_conda_exe,
src_file=environment_file,
platforms=platforms or DEFAULT_PLATFORMS,
include_dev_dependencies=include_dev_dependencies,
channel_overrides=channel_overrides,
)


Expand All @@ -442,6 +475,7 @@ def main():
platforms=args.platform,
no_mamba=args.no_mamba,
include_dev_dependencies=args.dev_dependencies,
channel_overrides=args.channel_overrides,
)


Expand Down