Skip to content

Commit 48f28e3

Browse files
committed
Change --galaxy_python_version default to None
Follow up on commit 6047d8b .
1 parent 9e8adb3 commit 48f28e3

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

planemo/galaxy/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ def config_join(*args):
399399
)
400400
_ensure_directory(shed_tool_path)
401401
port = _get_port(kwds)
402-
if parse_version(kwds.get('galaxy_python_version', DEFAULT_PYTHON_VERSION)) >= parse_version('3'):
402+
if parse_version(kwds.get('galaxy_python_version') or DEFAULT_PYTHON_VERSION) >= parse_version('3'):
403403
# on python 3 we use gunicorn,
404404
# which requires 'main' as server name
405405
server_name = 'main'
@@ -947,7 +947,7 @@ def startup_command(self, ctx, **kwds):
947947
run_script += " --server-name %s" % shlex_quote(self.server_name)
948948
server_ini = os.path.join(self.config_directory, "galaxy.ini")
949949
self.env["GALAXY_CONFIG_FILE"] = server_ini
950-
if parse_version(kwds.get('galaxy_python_version', DEFAULT_PYTHON_VERSION)) >= parse_version('3'):
950+
if parse_version(kwds.get('galaxy_python_version') or DEFAULT_PYTHON_VERSION) >= parse_version('3'):
951951
# We need to start under gunicorn
952952
self.env['APP_WEBSERVER'] = 'gunicorn'
953953
self.env['GUNICORN_CMD_ARGS'] = "--bind={host}:{port} --name={server_name}".format(

planemo/galaxy/run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def locate_galaxy_virtualenv(ctx, kwds):
5858
workspace = ctx.workspace
5959
galaxy_branch = kwds.get("galaxy_branch") or "master"
6060
shared_venv_path = os.path.join(workspace, "gx_venv")
61-
galaxy_python_version = kwds.get('galaxy_python_version', DEFAULT_PYTHON_VERSION)
61+
galaxy_python_version = kwds.get('galaxy_python_version') or DEFAULT_PYTHON_VERSION
6262
if galaxy_python_version != DEFAULT_PYTHON_VERSION:
6363
shared_venv_path = "%s_%s" % (shared_venv_path, galaxy_python_version)
6464
if galaxy_branch != "master":

planemo/options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def galaxy_python_version():
133133
return planemo_option(
134134
'--galaxy_python_version',
135135
use_global_config=True,
136-
default='2.7',
136+
default=None,
137137
type=click.Choice(['2', '2.7', '3', '3.3', '3.4', '3.5', '3.6', '3.7']),
138138
help="Python version to start Galaxy under",
139139
)

0 commit comments

Comments
 (0)