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

Fix an issue with --include-depends #50

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix an issue with --include-depends #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e07e22
Fix an issue with --include-depends
analog-cbarber Jul 16, 2021
ec6801e
Fix an issue with --include-depends
analog-cbarber Jul 16, 2021
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
21 changes: 16 additions & 5 deletions conda_mirror/conda_mirror.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ def _restore_required_dependencies(
all_packages: Dict[str, Dict[str, Any]],
excluded: Set[str],
required: Set[str],
processed_names: Set[str],
) -> Set[str]:
"""Recursively removes dependencies of required packages from excluded packages.

Expand All @@ -189,6 +190,9 @@ def _restore_required_dependencies(
Initial set of package filenames to be excluded from download.
required:
Set of package filenames initially to be included.
processed_names:
Set of package names that have already been processed and
that should not be considered in any dependencies.

Returns
-------
Expand All @@ -199,8 +203,6 @@ def _restore_required_dependencies(

# TODO - support platform-specific + noarch

already_required = set(all_packages.get(r, {}).get("name") for r in required)

final_excluded: Set[str] = set(excluded)

while len(final_excluded) > 0 and len(cur_required) > 0:
Expand All @@ -214,7 +216,7 @@ def _restore_required_dependencies(
pkg_name, version_spec = dep.split(maxsplit=1)
except ValueError:
pkg_name, version_spec = dep, ""
if pkg_name not in already_required:
if pkg_name not in processed_names:
required_depend_specs.setdefault(pkg_name, set()).add(version_spec)

cur_required.clear()
Expand Down Expand Up @@ -286,7 +288,12 @@ def _make_arg_parser():
"-D",
"--include-depends",
action="store_true",
help=("Include packages matching any dependencies of packages in whitelist."),
help="""
Include direct and indirect dependencies of packages in whitelist.
This will not include new packages that are explicitly named in the whitelist.
For example, if the whitelist requires python 2.7 and it is not found in the channel,
then no other version of python will be pulled in through the dependencies.
""",
)
ap.add_argument(
"-v",
Expand Down Expand Up @@ -1037,15 +1044,19 @@ def main(

# 3. un-blacklist packages that are actually whitelisted
# match whitelist on blacklist
included_package_names: Set[str] = set()
if whitelist:
for wlist in whitelist:
name = wlist.get("name")
if name and "*" not in name:
included_package_names.add(name)
matched_packages = list(_match(packages, wlist))
required_packages.update(matched_packages)
excluded_packages.difference_update(required_packages)

if include_depends:
excluded_packages = _restore_required_dependencies(
packages, excluded_packages, required_packages
packages, excluded_packages, required_packages, included_package_names
)

# make final mirror list of not-blacklist + whitelist
Expand Down
8 changes: 6 additions & 2 deletions test/test_conda_mirror.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,25 @@ def test_restore_required_dependencies(repodata):
_, all_packages = repodata["conda-forge"]
excluded = set(all_packages)

excluded2 = restore(all_packages, excluded, set())
excluded2 = restore(all_packages, excluded, set(), set())
assert excluded2 == excluded

conda_packages = _match(all_packages, dict(name="conda", version=">=4.10"))
for p in conda_packages.values():
assert p.get("name") == "conda"

required = set(list(conda_packages)[:1]) # just take the first match
excluded2 = restore(all_packages, excluded - required, required)
excluded2 = restore(
all_packages, excluded - required, required, {"conda", "python", "python_abi"}
)
reincluded = excluded - excluded2
reincluded_names = set(all_packages.get(r).get("name") for r in reincluded)

assert len(excluded) > len(reincluded) > 0
assert "yaml" in reincluded_names
assert "requests" in reincluded_names
assert "python" not in reincluded_names
assert "python_abi" not in reincluded_names


def test_version():
Expand Down