2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1ec7fa5ac5e3/ Changeset: 1ec7fa5ac5e3 Branch: next-stable User: dannon Date: 2014-05-20 00:11:52 Summary: Add conditional requirement of importlib for python 2.6/kombu. Affected #: 3 files diff -r 5c2c82003b8fe415f16182bd90398c4b0cbdecae -r 1ec7fa5ac5e379d308843d633d0bff3d83b34806 eggs.ini --- a/eggs.ini +++ b/eggs.ini @@ -43,6 +43,7 @@ elementtree = 1.2.6_20050316 Fabric = 1.7.0 GeneTrack = 2.0.0_beta_1 +importlib = 1.0.3 kombu = 3.0.12 lrucache = 0.2 Mako = 0.4.1 diff -r 5c2c82003b8fe415f16182bd90398c4b0cbdecae -r 1ec7fa5ac5e379d308843d633d0bff3d83b34806 lib/galaxy/queue_worker.py --- a/lib/galaxy/queue_worker.py +++ b/lib/galaxy/queue_worker.py @@ -5,8 +5,13 @@ import logging import threading +import sys + import galaxy.queues from galaxy import eggs, util +if sys.version_info < (2, 7, 0): + # Kombu requires importlib to function under Python 2.6. + eggs.require('importlib') eggs.require('kombu') from kombu import Connection diff -r 5c2c82003b8fe415f16182bd90398c4b0cbdecae -r 1ec7fa5ac5e379d308843d633d0bff3d83b34806 lib/galaxy/queues.py --- a/lib/galaxy/queues.py +++ b/lib/galaxy/queues.py @@ -4,9 +4,14 @@ """ +import sys + from galaxy import eggs -eggs.require("kombu") +if sys.version_info < (2, 7, 0): + # Kombu requires importlib to function in Python 2.6. + eggs.require('importlib') +eggs.require('kombu') from kombu import Exchange, Queue ALL_CONTROL = "control.*" https://bitbucket.org/galaxy/galaxy-central/commits/e170406ece79/ Changeset: e170406ece79 User: dannon Date: 2014-05-20 00:12:05 Summary: Merge next-stable Affected #: 3 files diff -r 3100a0f55b14c4193e2621009bb5e3f9d1c2e634 -r e170406ece79b72e991dd94345f5f1da9efd88a6 eggs.ini --- a/eggs.ini +++ b/eggs.ini @@ -43,6 +43,7 @@ elementtree = 1.2.6_20050316 Fabric = 1.7.0 GeneTrack = 2.0.0_beta_1 +importlib = 1.0.3 kombu = 3.0.12 lrucache = 0.2 Mako = 0.4.1 diff -r 3100a0f55b14c4193e2621009bb5e3f9d1c2e634 -r e170406ece79b72e991dd94345f5f1da9efd88a6 lib/galaxy/queue_worker.py --- a/lib/galaxy/queue_worker.py +++ b/lib/galaxy/queue_worker.py @@ -5,8 +5,13 @@ import logging import threading +import sys + import galaxy.queues from galaxy import eggs, util +if sys.version_info < (2, 7, 0): + # Kombu requires importlib to function under Python 2.6. + eggs.require('importlib') eggs.require('kombu') from kombu import Connection diff -r 3100a0f55b14c4193e2621009bb5e3f9d1c2e634 -r e170406ece79b72e991dd94345f5f1da9efd88a6 lib/galaxy/queues.py --- a/lib/galaxy/queues.py +++ b/lib/galaxy/queues.py @@ -4,9 +4,14 @@ """ +import sys + from galaxy import eggs -eggs.require("kombu") +if sys.version_info < (2, 7, 0): + # Kombu requires importlib to function in Python 2.6. + eggs.require('importlib') +eggs.require('kombu') from kombu import Exchange, Queue ALL_CONTROL = "control.*" 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.