2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b29ac7cfd60e/ Changeset: b29ac7cfd60e Branch: next-stable User: dannon Date: 2014-05-20 01:54:05 Summary: Additional anyjson requires (appeared to cause Toolshed issues for Greg) Affected #: 2 files diff -r faf07312a7daf640f5ecdddd531e90268404a4fd -r b29ac7cfd60ed2aaec658f520f3e47f1af4d1ab2 lib/galaxy/queue_worker.py --- a/lib/galaxy/queue_worker.py +++ b/lib/galaxy/queue_worker.py @@ -9,6 +9,7 @@ import galaxy.queues from galaxy import eggs, util +eggs.require('anyjson') if sys.version_info < (2, 7, 0): # Kombu requires importlib and ordereddict to function under Python 2.6. eggs.require('importlib') diff -r faf07312a7daf640f5ecdddd531e90268404a4fd -r b29ac7cfd60ed2aaec658f520f3e47f1af4d1ab2 lib/galaxy/queues.py --- a/lib/galaxy/queues.py +++ b/lib/galaxy/queues.py @@ -8,6 +8,7 @@ from galaxy import eggs +eggs.require('anyjson') if sys.version_info < (2, 7, 0): # Kombu requires importlib and ordereddict to function in Python 2.6. eggs.require('importlib') https://bitbucket.org/galaxy/galaxy-central/commits/11403745e7ce/ Changeset: 11403745e7ce User: dannon Date: 2014-05-20 01:54:25 Summary: Merge next-stable Affected #: 2 files diff -r 4b3cfc947e1d151d61351d75397863760f1443f1 -r 11403745e7ceb0a6946af648dcd3ca24a638ca7e lib/galaxy/queue_worker.py --- a/lib/galaxy/queue_worker.py +++ b/lib/galaxy/queue_worker.py @@ -9,6 +9,7 @@ import galaxy.queues from galaxy import eggs, util +eggs.require('anyjson') if sys.version_info < (2, 7, 0): # Kombu requires importlib and ordereddict to function under Python 2.6. eggs.require('importlib') diff -r 4b3cfc947e1d151d61351d75397863760f1443f1 -r 11403745e7ceb0a6946af648dcd3ca24a638ca7e lib/galaxy/queues.py --- a/lib/galaxy/queues.py +++ b/lib/galaxy/queues.py @@ -8,6 +8,7 @@ from galaxy import eggs +eggs.require('anyjson') if sys.version_info < (2, 7, 0): # Kombu requires importlib and ordereddict to function in Python 2.6. eggs.require('importlib') 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.