[galaxy-commits] commit/galaxy-central: Dave Bouvier: Explicitly require paramiko before loading the Fabric egg, in order to resolve a version conflict in cases where the system paramiko version is older than 1.10.0.

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a7e3721795d6/ Changeset: a7e3721795d6 User: Dave Bouvier Date: 2013-09-26 18:15:02 Summary: Explicitly require paramiko before loading the Fabric egg, in order to resolve a version conflict in cases where the system paramiko version is older than 1.10.0. Affected #: 1 file diff -r 736555674763159f1422c1c822e93019ed6a62ed -r a7e3721795d6c480d4e116f1054235450102d725 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 @@ -11,10 +11,9 @@ from galaxy.util.template import fill_template from galaxy import eggs -import pkg_resources - -pkg_resources.require('ssh' ) -pkg_resources.require( 'Fabric' ) +eggs.require( 'ssh' ) +eggs.require( 'paramiko' ) +eggs.require( 'Fabric' ) from fabric.api import env from fabric.api import lcd 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.