commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ca99a6970101/ Changeset: ca99a6970101 Branch: mepcotterell/allow-pip-to-run-when-venv_directory-con-1373715782557 User: mepcotterell Date: 2013-07-13 13:44:05 Summary: allow pip to run when venv_directory contains spaces Affected #: 1 file diff -r a0ea8ac5583cd295266eac38a12da4d9fd7613ac -r ca99a6970101125e19328e72216c120a3a8027aa lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -277,7 +277,7 @@ # 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" ) - install_command = "pip install -r '%s'" % requirements_path + install_command = "python '%s' install -r '%s'" % ( os.path.join( venv_directory, "bin", "pip" ), requirements_path ) full_setup_command = "%s; %s; %s" % ( setup_command, activate_command, install_command ) return_code = handle_command( app, tool_dependency, install_dir, full_setup_command ) if return_code: https://bitbucket.org/galaxy/galaxy-central/commits/559effee9eb7/ Changeset: 559effee9eb7 User: natefoo Date: 2013-07-19 22:52:50 Summary: Merged in mepcotterell/galaxy-central/mepcotterell/allow-pip-to-run-when-venv_directory-con-1373715782557 (pull request #195) allow pip to run when venv_directory contains spaces Affected #: 1 file diff -r 2ba6bd8a9d25e26ce6668c2a0219199b49e255d7 -r 559effee9eb7a5b0b78fea2df900e35dd5cf7d04 lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -277,7 +277,7 @@ # 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" ) - install_command = "pip install -r '%s'" % requirements_path + install_command = "python '%s' install -r '%s'" % ( os.path.join( venv_directory, "bin", "pip" ), requirements_path ) full_setup_command = "%s; %s; %s" % ( setup_command, activate_command, install_command ) return_code = handle_command( app, tool_dependency, install_dir, full_setup_command ) if return_code: 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.
participants (1)
-
commits-noreply@bitbucket.org