1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/8ed5006bfc1f/ Changeset: 8ed5006bfc1f User: dan Date: 2014-04-28 21:12:13 Summary: Allow specifying a specific python version when using setup_virtualenv. Affected #: 1 file
diff -r a4a71a03ed7a11ccea7d889bd566fb003932647b -r 8ed5006bfc1f67350834291bc81ace94312ad070 lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py @@ -1133,8 +1133,9 @@ with open( requirements_path, "w" ) as f: f.write( requirements ) venv_directory = os.path.join( install_dir, "venv" ) + python_cmd = action_dict[ 'python' ] # TODO: Consider making --no-site-packages optional. - setup_command = "python %s/virtualenv.py --no-site-packages '%s'" % (venv_src_directory, venv_directory) + setup_command = "%s %s/virtualenv.py --no-site-packages '%s'" % ( python_cmd, venv_src_directory, venv_directory ) # POSIXLY_CORRECT forces shell commands . and source to have the same # and well defined behavior in bash/zsh. activate_command = "POSIXLY_CORRECT=1; . %s" % os.path.join( venv_directory, "bin", "activate" ) @@ -1183,6 +1184,7 @@ # lxml==2.3.0</action> ## Manually specify contents of requirements.txt file to create dynamically. action_dict[ 'requirements' ] = td_common_util.evaluate_template( action_elem.text or 'requirements.txt', install_dir ) + action_dict[ 'python' ] = action_elem.get( 'python', 'python' ) return action_dict
class ShellCommand( RecipeStep ):
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.