Merge pull request #10559 from nsoranzo/release_20.09_lower_package_name

[20.09] Make package names lowercase for mulled dependency resolving
This commit is contained in:
Marius van den Beek
2020-10-27 17:22:17 +01:00
committed by GitHub
2 changed files with 4 additions and 3 deletions
@@ -15,9 +15,9 @@ from .mulled_build import (
add_build_arguments,
add_single_image_arguments,
args_to_mull_targets_kwds,
build_target,
mull_targets,
)
from .util import build_target
def main(argv=None):
+3 -2
View File
@@ -83,7 +83,7 @@ def mulled_tags_for(namespace, image, tag_prefix=None, resolution_cache=None):
# Following check is pretty expensive against biocontainers... don't even bother doing it
# if can't cache the response.
if not _namespace_has_repo_name(namespace, image, resolution_cache):
log.debug("skipping mulled_tags_for [%s] no repository" % image)
log.info("skipping mulled_tags_for [%s] no repository" % image)
return []
cache_key = "galaxy.tool_util.deps.container_resolvers.mulled.util:tag_cache"
@@ -158,7 +158,8 @@ def build_target(package_name, version=None, build=None, tag=None):
assert build is None
version, build = split_tag(tag)
return Target(package_name, version, build, package_name)
# conda package and quay image names are lowercase
return Target(package_name.lower(), version, build, package_name)
def conda_build_target_str(target):