Merge lp://staging/~stefanor/ibid/sqlalchemy-0.6-trunk into lp://staging/ibid

I see from uncommitted diffs on my laptop, that I started trying to get to the bottom of the test failures with SQLAlchemy > 0.5, but I think that's non-trivial.

How about we land this now, and fix it up in trunk?

Approving this because ibid has been running this branch for a while, and there have not been any problems. I did do a quick look over the diff and couldn't see any problems.

by ibid, i mean tibid.

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 2 Pending.

per Keegan

The attempt to merge lp:~stefanor/ibid/sqlalchemy-0.6-trunk into lp:ibid failed. Below is the output from the failed tests.

                                                                        [ERROR]

===============================================================================
[ERROR]: ibid

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/twisted/trial/runner.py", line 651, in loadByNames
    things.append(self.findByName(name))
  File "/usr/lib/python2.6/dist-packages/twisted/trial/runner.py", line 460, in findByName
    return filenameToModule(name)
  File "/usr/lib/python2.6/dist-packages/twisted/trial/runner.py", line 95, in filenameToModule
    ret = reflect.namedAny(reflect.filenameToModuleName(fn))
  File "/usr/lib/python2.6/dist-packages/twisted/python/reflect.py", line 464, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/home/stefanor/ibid/tarmac-trunk/ibid/__init__.py", line 16, in <module>
    import ibid.core
  File "/home/stefanor/ibid/tarmac-trunk/ibid/core.py", line 21, in <module>
    from ibid.db import SchemaVersionException, schema_version_check
  File "/home/stefanor/ibid/tarmac-trunk/ibid/db/__init__.py", line 5, in <module>
    from ibid.db.types import Integer, DateTime, Boolean, \
  File "/home/stefanor/ibid/tarmac-trunk/ibid/db/types.py", line 75, in <module>
    monkey_patch()
  File "/home/stefanor/ibid/tarmac-trunk/ibid/db/types.py", line 9, in monkey_patch
    import sqlalchemy.dialects.postgresql
exceptions.ImportError: No module named dialects.postgresql
-------------------------------------------------------------------------------

FAILED (errors=1)

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/twisted/python/usage.py", line 241, in parseOptions
    self.postOptions()
  File "/usr/lib/python2.6/dist-packages/twisted/scripts/trial.py", line 295, in postOptions
    self['reporter'] = self._loadReporterByName(self['reporter'])
  File "/usr/lib/python2.6/dist-packages/twisted/scripts/trial.py", line 281, in _loadReporterByName
    for p in plugin.getPlugins(itrial.IReporter):
  File "/usr/lib/python2.6/dist-packages/twisted/plugin.py", line 200, in getPlugins
    allDropins = getCache(package)
--- <exception caught here> ---
  File "/usr/lib/python2.6/dist-packages/twisted/plugin.py", line 165, in getCache
    provider = pluginModule.load()
  File "/usr/lib/python2.6/dist-packages/twisted/python/modules.py", line 381, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/usr/lib/python2.6/dist-packages/twisted/python/reflect.py", line 464, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/home/stefanor/ibid/tarmac-trunk/twisted/plugins/ibid_plugin.py", line 10, in <module>
    import ibid
  File "/home/stefanor/ibid/tarmac-trunk/ibid/__init__.py", line 16, in <module>
    import ibid.core
  File "/home/stefanor/ibid/tarmac-trunk/ibid/core.py", line 21, in <module>
    from ibid.db import SchemaVersionException, schema_version_check
  File "/home/stefanor/ibid/tarmac-trunk/ibid/db/__init__.py", line 5, in <module>
    from ibid.db.types import Integer, DateTime, Boolean, \
 ...

Surewhynot.

Attempt to merge into lp:ibid failed due to conflicts:

text conflict in ibid/test/__init__.py

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Here's a biscuit, tarmac

blind approvals ftw