Merge lp://staging/~adam-collard/storm/sqlobject2-compatibility into lp://staging/storm

Proposed by Adam Collard
Status: Merged
Approved by: Benji York
Approved revision: 481
Merged at revision: 479
Proposed branch: lp://staging/~adam-collard/storm/sqlobject2-compatibility
Merge into: lp://staging/storm
Diff against target: 38 lines (+12/-12)
1 file modified
tests/sqlobject.py (+12/-12)
To merge this branch: bzr merge lp://staging/~adam-collard/storm/sqlobject2-compatibility
Reviewer Review Type Date Requested Status
Adam Collard (community) Abstain
Benji York (community) Approve
Review via email: mp+287629@code.staging.launchpad.net

Description of the change

Fix compatibility in Storm for SQLObject 2.x

Note tests on Xenial are still broken due to Django API changes - this will be addressed in a subsequent branch.

To post a comment you must log in.
481. By Adam Collard

Revert Ubuntu deps change for Django tests

Revision history for this message
Benji York (benji) wrote :

This change looks good -- and the tests even pass ;)

review: Approve
Revision history for this message
Adam Collard (adam-collard) :
review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: