2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/faf07312a7da/ Changeset: faf07312a7da Branch: next-stable User: dannon Date: 2014-05-20 00:58:13 Summary: Kombu also requires ordereddict backport to support python2.6, more eggs. Affected #: 3 files diff -r 1ec7fa5ac5e379d308843d633d0bff3d83b34806 -r faf07312a7daf640f5ecdddd531e90268404a4fd eggs.ini --- a/eggs.ini +++ b/eggs.ini @@ -51,6 +51,7 @@ nose = 0.11.1 NoseHTML = 0.4.1 NoseTestDiff = 0.1 +ordereddict = 1.1 paramiko = 1.11.1 Parsley = 1.1 Paste = 1.7.5.1 diff -r 1ec7fa5ac5e379d308843d633d0bff3d83b34806 -r faf07312a7daf640f5ecdddd531e90268404a4fd lib/galaxy/queue_worker.py --- a/lib/galaxy/queue_worker.py +++ b/lib/galaxy/queue_worker.py @@ -10,8 +10,9 @@ import galaxy.queues from galaxy import eggs, util if sys.version_info < (2, 7, 0): - # Kombu requires importlib to function under Python 2.6. + # Kombu requires importlib and ordereddict to function under Python 2.6. eggs.require('importlib') + eggs.require('ordereddict') eggs.require('kombu') from kombu import Connection diff -r 1ec7fa5ac5e379d308843d633d0bff3d83b34806 -r faf07312a7daf640f5ecdddd531e90268404a4fd lib/galaxy/queues.py --- a/lib/galaxy/queues.py +++ b/lib/galaxy/queues.py @@ -9,8 +9,9 @@ from galaxy import eggs if sys.version_info < (2, 7, 0): - # Kombu requires importlib to function in Python 2.6. + # Kombu requires importlib and ordereddict to function in Python 2.6. eggs.require('importlib') + eggs.require('ordereddict') eggs.require('kombu') from kombu import Exchange, Queue https://bitbucket.org/galaxy/galaxy-central/commits/4b3cfc947e1d/ Changeset: 4b3cfc947e1d User: dannon Date: 2014-05-20 00:58:28 Summary: Merge from next-stable. Affected #: 3 files diff -r e170406ece79b72e991dd94345f5f1da9efd88a6 -r 4b3cfc947e1d151d61351d75397863760f1443f1 eggs.ini --- a/eggs.ini +++ b/eggs.ini @@ -51,6 +51,7 @@ nose = 0.11.1 NoseHTML = 0.4.1 NoseTestDiff = 0.1 +ordereddict = 1.1 paramiko = 1.11.1 Parsley = 1.1 Paste = 1.7.5.1 diff -r e170406ece79b72e991dd94345f5f1da9efd88a6 -r 4b3cfc947e1d151d61351d75397863760f1443f1 lib/galaxy/queue_worker.py --- a/lib/galaxy/queue_worker.py +++ b/lib/galaxy/queue_worker.py @@ -10,8 +10,9 @@ import galaxy.queues from galaxy import eggs, util if sys.version_info < (2, 7, 0): - # Kombu requires importlib to function under Python 2.6. + # Kombu requires importlib and ordereddict to function under Python 2.6. eggs.require('importlib') + eggs.require('ordereddict') eggs.require('kombu') from kombu import Connection diff -r e170406ece79b72e991dd94345f5f1da9efd88a6 -r 4b3cfc947e1d151d61351d75397863760f1443f1 lib/galaxy/queues.py --- a/lib/galaxy/queues.py +++ b/lib/galaxy/queues.py @@ -9,8 +9,9 @@ from galaxy import eggs if sys.version_info < (2, 7, 0): - # Kombu requires importlib to function in Python 2.6. + # Kombu requires importlib and ordereddict to function in Python 2.6. eggs.require('importlib') + eggs.require('ordereddict') eggs.require('kombu') from kombu import Exchange, Queue 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.