lp://staging/~cjwatson/storm/reporter-circular-import-workaround
- Get this branch:
- bzr branch lp://staging/~cjwatson/storm/reporter-circular-import-workaround
Branch merges
- Adam Collard (community): Approve
-
Diff: 17 lines (+6/-0)1 file modifiedtest (+6/-0)
Branch information
Recent revisions
- 486. By Colin Watson
-
Work around circular import bug in twisted.
trial.reporter. I've submitted https:/
/github. com/twisted/ twisted/ pull/1148 to fix this
properly, but the bug has been in Twisted stable releases since 16.0.0
so it gets in the way of testing using tox. - 485. By Colin Watson
-
Merge lp:~cjwatson/storm/more-weakrefs [r=adam-
collard, tonysimpson] Use weak references from Variable and MutableValueVar
iable to EventSystem, to avoid GC cycles. - 484. By Alberto Donato
-
Revert merge from r483 (which breaks when different stores are involved). [trivial]
- 483. By Alberto Donato
-
Merge lp:~ack/storm/expr-is-in-resultset [r=free.ekanayaka].
This change allows to use a subquery (insted of performing two separate queries) when the Comparable.
is_in(ResultSet ) expression is used. - 482. By Alberto Donato
-
Merged postgres-
json-support [r=free.ekanayaka]. This adds a Postgres-specific version of the JSON property (and JSONVariable).
It's supposed to be used with the Postgres "json" type.Note that psycopg2 >= 2.5 automatically decodes json values to python objects, while previous versions return a plain string.
- 481. By Alberto Donato
-
Merged postgres-
json-operators [r=danilo,benji] [f=1563786]. This adds support for "->" and "->>" Postgres JSON operators.
- 480. By Benji York
-
Merge lp:~adam-collard/storm/kill-django-storm [r=benji]
Remove Django support in Storm.
The Django support has long since bit-rotted in Storm, and searching
on http://searchcode. com/ shows it isn't being used. Rather than try
to keep it alive this branch does the honourable thing and shoots it
in the head.With this branch merged, tests should pass on Xenial.
- 479. By Benji York
-
Merge lp:~adam-collard/storm/sqlobject2-compatibility [r=benji]
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. - 478. By Björn Tillenius
-
Merge lp:~cjwatson/storm/psycopg-2.5 [r=adam-
collard, r=bjornt, a=cjwatson] Use ABCMeta for exception base class injection.
This lets us be compatible with psycopg2 >= 2.5, where Error and subclasses are implemented in a C extension so can't have their __bases__ attribute patched.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/storm