1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/changeset/67b9614dcab4/ changeset: 67b9614dcab4 user: dannon date: 2012-11-20 19:05:32 summary: Adjust sqlalchemy import ordering, fixes functional test running. affected #: 1 file

diff -r e856e0b90cd21338e27c385e9615612715bc7632 -r 67b9614dcab440027292c5dc387ef2eb1a763c19 lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -9,8 +9,6 @@ pkg_resources.require("simplejson") pkg_resources.require("pexpect") import simplejson, os, errno, codecs, operator, socket, pexpect, logging, time -from sqlalchemy.orm import object_session -from sqlalchemy.sql.expression import func import galaxy.datatypes import galaxy.datatypes.registry from galaxy.datatypes.metadata import MetadataCollection @@ -21,6 +19,8 @@ from galaxy.web.form_builder import (AddressField, CheckboxField, PasswordField, SelectField, TextArea, TextField, WorkflowField, WorkflowMappingField, HistoryField) from galaxy.model.item_attrs import UsesAnnotations, APIItem +from sqlalchemy.orm import object_session +from sqlalchemy.sql.expression import func

log = logging.getLogger( __name__ )

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.