Merge pull request #1379 from nsoranzo/bioblend_1.2.0

Fix for change of base_url in BioBlend 1.2.0
galaxyproject · Jul 19, 2023 · 2f828a1 · 2f828a1
2 parents 4fa2820 + 7615ad6
commit 2f828a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/planemo/runnable_resolve.py b/planemo/runnable_resolve.py
@@ -45,7 +45,8 @@ def for_runnable_identifiers(ctx, runnable_identifiers, kwds):
 def install_args_list_to_runnables(ctx, install_args_list, kwds):
     runnables = []
     for repo in install_args_list:
-        url = f'{repo["tool_shed_url"]}api/repositories/get_repository_revision_install_info'
+        base_tool_shed_url = repo["tool_shed_url"].rstrip("/")
+        url = f"{base_tool_shed_url}/api/repositories/get_repository_revision_install_info"
         response = requests.get(
             url, params={"name": repo["name"], "owner": repo["owner"], "changeset_revision": repo["changeset_revision"]}
         )

diff --git a/planemo/shed/interface.py b/planemo/shed/interface.py
@@ -7,7 +7,7 @@
 
 from planemo.io import untar_to
 
-REPOSITORY_DOWNLOAD_TEMPLATE = "%srepository/download?repository_id=%s" "&changeset_revision=default&file_type=gz"
+REPOSITORY_DOWNLOAD_TEMPLATE = "%s/repository/download?repository_id=%s&changeset_revision=default&file_type=gz"
 
 
 def tool_shed_instance(url, key, email, password):
@@ -80,9 +80,7 @@ def find_category_ids(tsi, categories):
 
 
 def download_tar(tsi, repo_id, destination, to_directory):
-    base_url = tsi.base_url
-    if not base_url.endswith("/"):
-        base_url += "/"
+    base_url = tsi.base_url.rstrip("/")
     download_url = REPOSITORY_DOWNLOAD_TEMPLATE % (base_url, repo_id)
     if to_directory:
         tar_args = ["-xzf", "-", "--strip-components=1"]