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.

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

Install prebuilt client by default #1450

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions planemo/commands/cmd_ci_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ def cli(ctx, **kwds):
Useful for populating a CI cache.
"""
kwds["galaxy_skip_client_build"] = True
kwds["no_dependency_resolution"] = True
with serve_daemon(ctx, **kwds):
return
1 change: 0 additions & 1 deletion planemo/commands/cmd_serve.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,5 @@ def cli(ctx, uris, **kwds):
"""
paths = uris_to_paths(ctx, uris)
runnables = for_paths(paths)
kwds["galaxy_skip_client_build"] = kwds.pop("skip_client_build", False)
with galaxy_serve(ctx, runnables, **kwds):
pass
1 change: 0 additions & 1 deletion planemo/commands/cmd_shed_serve.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def cli(ctx, paths, **kwds):
install these artifacts, and serve a Galaxy instances that can be
logged into and explored interactively.
"""
kwds["galaxy_skip_client_build"] = kwds.pop("skip_client_build", False)
install_args_list = kwds["install_args_list"] = shed.install_arg_lists(ctx, paths, **kwds)
runnables = install_args_list_to_runnables(ctx, install_args_list, kwds)
with engine_context(ctx, **kwds) as engine:
Expand Down
2 changes: 2 additions & 0 deletions planemo/galaxy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,8 @@ def config_join(*args):
install_env = {}
if kwds.get("galaxy_skip_client_build", True):
install_env["GALAXY_SKIP_CLIENT_BUILD"] = "1"
elif kwds.get("galaxy_install_prebuilt_client", True):
install_env["GALAXY_INSTALL_PREBUILT_CLIENT"] = "1"
if galaxy_root is None:
galaxy_root = config_join("galaxy-dev")
if not os.path.isdir(galaxy_root):
Expand Down
17 changes: 16 additions & 1 deletion planemo/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,21 @@ def skip_venv_option():
def skip_client_build_option():
"""Annotate click command as consume the --skip_client_build option."""
return planemo_option(
"--skip_client_build", is_flag=True, default=False, help=("Do not build Galaxy client when serving Galaxy.")
"--skip_client_build",
"galaxy_skip_client_build",
is_flag=True,
default=False,
help=("Do not build Galaxy client when serving Galaxy."),
)


def install_prebuilt_client_option():
return planemo_option(
"--install_prebuilt_client/--no_install_prebuilt_client",
"galaxy_install_prebuilt_client",
is_flag=True,
default=True,
help=("Install a pre-built client from npm. Turn this off you need access to visualizations."),
)


Expand Down Expand Up @@ -1268,6 +1282,7 @@ def galaxy_serve_options():
daemon_option(),
pid_file_option(),
ignore_dependency_problems_option(),
install_prebuilt_client_option(),
skip_client_build_option(),
shed_install_option(),
)
Expand Down
6 changes: 2 additions & 4 deletions scripts/lint_sphinx_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


def warning_line(line):
if "WARNING" not in line:
if "WARNING" not in line or "Toil" in line:
return False
if "docs/tests" in line: # Doesn't actually show up in docs so don't lint.
return False
Expand All @@ -23,9 +23,7 @@ def main(argv=None):
argv = sys.argv
sphinx_output = sys.stdin.read()
warning_lines = [_ for _ in sphinx_output.splitlines() if warning_line(_)]
for line in warning_lines:
print(line)
sys.exit(1 if warning_lines else 0)
sys.exit("\n".join(warning_lines) if warning_lines else 0)


if __name__ == "__main__":
Expand Down