Skip to content

Commit

Permalink
Merge pull request #1388 from bernt-matthias/23.1
Browse files Browse the repository at this point in the history
Update upper bound for galaxy packages to < 23.2
  • Loading branch information
mvdbeek authored Dec 6, 2023
2 parents 129bc04 + b6f3b28 commit 5951e90
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 3 additions & 1 deletion planemo/commands/cmd_conda_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@ def cli(ctx: "PlanemoCliContext", paths: Tuple[str], **kwds) -> None:
# Force conda_use_local for building...
kwds["conda_use_local"] = True
conda_context = build_conda_context(ctx, handle_auto_init=True, **kwds)
if conda_context.exec_command("build", paths) != 0:
exit_code = conda_context.exec_command("build", paths)
if exit_code:
error(f"Failed to build [{' '.join(paths)}] with conda.")
ctx.exit(exit_code)
3 changes: 2 additions & 1 deletion planemo/commands/cmd_conda_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ def cli(ctx, paths, **kwds):
conda_target, conda_context=conda_context, skip_environment=kwds.get("global", False)
)
return_codes.append(return_code)
return coalesce_return_codes(return_codes, assert_at_least_one=True)
exit_code = coalesce_return_codes(return_codes, assert_at_least_one=True)
ctx.exit(exit_code)
3 changes: 2 additions & 1 deletion planemo/commands/cmd_conda_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ def cli(ctx, term, **kwds):
if conda_context.conda_version >= VERSION_4_DOT_4:
term = "*%s*" % term
args = conda_context._override_channels_args + [term]
conda_context.exec_command("search", args)
exit_code = conda_context.exec_command("search", args)
ctx.exit(exit_code)
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ bioblend>=1.0.0
click!=8.0.2
cwltool>=1.0.20191225192155
ephemeris>=0.10.3
galaxy-tool-util>=23.0,<23.1
galaxy-util[template]>=23.0,<23.1
galaxy-tool-util>=23.0,<24.0
galaxy-util[template]>=23.0,<24.0
glob2
gxformat2>=0.14.0
h5py
Expand Down

0 comments on commit 5951e90

Please sign in to comment.