Skip to content

Commit 072e7c6

Browse files
committed
Default to omitting the virtualenv command, and don't force it to follow
the format `python...`.
1 parent 003df1d commit 072e7c6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,11 @@ Options for controlling where certain Galaxy components are placed on the filesy
251251

252252
- `galaxy_venv_dir` (default: `<galaxy_server_dir>/.venv`): The role will create a [virtualenv][virtualenv] from which
253253
Galaxy will run, this controls where the virtualenv will be placed.
254-
- `galaxy_venv_python` (default: `2.7`): The python version to use when creating the virtualenv. Must be either 2.7, or 3.5 or higher.
254+
- `galaxy_virtualenv_command`: (default: `virtualenv`): The command used to create Galaxy's virtualenv. Set to `pyvenv`
255+
to use Python 3 on Galaxy >= 20.01.
256+
- `galaxy_virtualenv_python`: (default: python of first `virtualenv` or `python` command on `$PATH`): The python binary
257+
to use when creating the virtualenv. For Galaxy < 20.01, use python2.7 (if it is not the default), for Galaxy >=
258+
20.01, use `python3.5` or higher.
255259
- `galaxy_config_dir` (default: `<galaxy_server_dir>`): Directory that will be used for "static" configuration files.
256260
- `galaxy_mutable_config_dir` (default: `<galaxy_server_dir>`): Directory that will be used for "mutable" configuration
257261
files, must be writable by the user running Galaxy.

tasks/virtualenv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
virtualenv: "{{ galaxy_venv_dir }}"
1111
extra_args: "{{ pip_extra_args | default('') }}"
1212
virtualenv_command: "{{ galaxy_virtualenv_command | default(pip_virtualenv_command | default(omit)) }}"
13-
virtualenv_python: "python{{ galaxy_venv_python | default('2.7') }}"
13+
virtualenv_python: "{{ galaxy_virtualenv_python | default(omit) }}"
1414
environment:
1515
VIRTUAL_ENV: "{{ galaxy_venv_dir }}"
1616

0 commit comments

Comments
 (0)