Update container_register for mulled v2 and repo name changes.

Author: jmchilton

planemo/commands/cmd_container_register.py

@@ -3,7 +3,7 @@
 
 import click
 
-from galaxy.tools.deps.mulled.util import image_name, quay_repository
+from galaxy.tools.deps.mulled.util import quay_repository, v2_image_name
 
 from planemo import options
 from planemo.cli import command_function
@@ -12,9 +12,9 @@
 from planemo.github_util import clone_fork_branch, get_repository_object, pull_request
 from planemo.mulled import conda_to_mulled_targets
 
-REGISTERY_TARGET_NAME = "multireqcontainers"
+REGISTERY_TARGET_NAME = "multi-package-containers"
 REGISTERY_TARGET_PATH = "combinations"
-REGISTERY_REPOSITORY = "jmchilton/multireqcontainers"
+REGISTERY_REPOSITORY = "jmchilton/multi-package-containers"
 DEFAULT_MESSAGE = "Add %s (generated with Planemo)."
 
 
@@ -31,7 +31,7 @@
         resolve_path=True,
     ),
     default=None,
-    help=("Container registration directory (defaults to ~/.planemo/multireqcontainers."),
+    help=("Container registration directory (defaults to ~/.planemo/multi-package-containers."),
 )
 @click.option(
     "-m",
@@ -81,9 +81,9 @@ def cli(ctx, paths, **kwds):
         if not best_practice_requirements:
             continue
 
-        name = image_name(mulled_targets)
+        name = v2_image_name(mulled_targets)
         tag = "0"
-        name_and_tag = "%s:%s" % (name, tag)
+        name_and_tag = "%s-%s" % (name, tag)
         target_filename = os.path.join(registry_target.output_directory, "%s.tsv" % name_and_tag)
         ctx.vlog("Target filename for registeration is [%s]" % target_filename)
         if os.path.exists(target_filename):
@@ -132,15 +132,16 @@ def __init__(self, ctx, **kwds):
     def has_pull_request_for(self, name):
         has_pr = False
         if self.do_pull_request:
-            if any([name in t for t in self.pr_titles]):
+            name_as_branch = name.replace(":", "-")
+            if any([name_as_branch in t for t in self.pr_titles]):
                 has_pr = True
 
         return has_pr
 
     def handle_pull_request(self, ctx, name, target_filename, **kwds):
         if self.do_pull_request:
             message = kwds["message"] % name
-            branch_name = name
+            branch_name = name.replace(":", "-")
             branch(ctx, self.target_repository, branch_name, from_branch="master")
             add(ctx, self.target_repository, target_filename)
             commit(ctx, self.target_repository, message=message)

requirements.txt

@@ -13,6 +13,6 @@ virtualenv
 lxml
 gxformat2>=0.1.1
 ephemeris>=0.2.0
-galaxy-lib>=17.5.10
+galaxy-lib>=17.9.0
 html5lib>=0.9999999,!=0.99999999,!=0.999999999,!=1.0b10,!=1.0b09 ; python_version == '2.7'
 cwltool==1.0.20170224141733 ; python_version == '2.7'