Skip to content

Commit

Permalink
Use new features in Galaxy 16.07 to improve serve command.
Browse files Browse the repository at this point in the history
 - Mount ``test-data`` directory as the FTP upload directory.
 - Automatically log user in as planemo@galaxyproject.org and as an admin.
  • Loading branch information
jmchilton committed Apr 14, 2016
1 parent cb3c5c2 commit 552059f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
7 changes: 7 additions & 0 deletions planemo/galaxy/config.py
Expand Up @@ -199,7 +199,14 @@ def config_join(*args):
log_level=kwds.get("log_level", "DEBUG"),
)
tool_config_file = "%s,%s" % (tool_conf, shed_tool_conf)
user_email = kwds.get("galaxy_email")
properties = dict(
single_user=user_email,
admin_users=user_email,
ftp_upload_dir_template="${ftp_upload_dir}",
ftp_upload_purge="False",
ftp_upload_dir=test_data_dir or os.path.abspath('.'),
ftp_upload_site="Test Data",
tool_dependency_dir=dependency_dir,
file_path=file_path,
new_file_path="${temp_directory}/tmp",
Expand Down
11 changes: 11 additions & 0 deletions planemo/options.py
Expand Up @@ -46,6 +46,16 @@ def tool_data_table_option():
)


def galaxy_email_option():
return planemo_option(
"--galaxy_email",
type=str,
default="planemo@galaxyproject.org",
use_global_config=True,
help="E-mail address to use when launching single-user Galaxy server.",
)


def galaxy_root_option():
return planemo_option(
"--galaxy_root",
Expand Down Expand Up @@ -720,6 +730,7 @@ def galaxy_target_options():
skip_venv_option(),
no_cache_galaxy_option(),
no_cleanup_option(),
galaxy_email_option(),
# Profile options...
job_config_option(),
tool_dependency_dir_option(),
Expand Down

0 comments on commit 552059f

Please sign in to comment.