Merge lp:~lifeless/python-oops-tools/deps into lp:python-oops-tools

[Robert Collins]

0.6.5 - use timeline-django 0.0.2.

timeline-django 0.0.1 was fairly broken, 0.0.2 is much better, so lets use it.

[Robert Collins (lifeless)]

Simples.

review: Approve

[lp:~lifeless/python-oops-tools/deps]

45. By Robert Collins on 2012-09-23

0.6.5 - use timeline-django 0.0.2.

=== modified file 'buildout-templates/bin/oopstools.wsgi.in'
--- buildout-templates/bin/oopstools.wsgi.in	2012-09-14 10:51:58 +0000
+++ buildout-templates/bin/oopstools.wsgi.in	2012-09-23 00:54:19 +0000
@@ -14,12 +14,14 @@
 from oops_wsgi.django import OOPSWSGIHandler
 
 application = OOPSWSGIHandler()
+from timeline_django.wsgi import make_app as timeline_django_make_app
 from timeline import wsgi as timeline_wsgi
-from timeline_django.setup import setup_for_requests as timeline_django_setup
-
-timeline_django_setup()
+pplication = timeline_django_make_app(application)
 application = timeline_wsgi.make_app(application)
 
+from timeline_django import setup
+setup.setup_for_requests()
+
 # Report OOPSes back to us.
 from functools import partial
 from oops import Config
@@ -36,9 +38,9 @@
 
 # Attach the timeline to error reports
 import oops_timeline
-from timeline_django.filters import install_hooks
+import timeline_django.filters
 oops_timeline.install_hooks(config)
-install_hooks(config)
+timeline_django.filters.install_hooks(config)
 
 # Can add custom filters / hooks if needed - see docs.
 factory = partial(amqp.Connection, host=settings.OOPS_WEB_AMQP_HOST,
 
=== modified file 'buildout-templates/src/oopstools/settings.py.in'
--- buildout-templates/src/oopstools/settings.py.in	2012-09-14 10:51:58 +0000
+++ buildout-templates/src/oopstools/settings.py.in	2012-09-23 00:54:19 +0000
@@ -62,7 +62,6 @@
 )
 
 MIDDLEWARE_CLASSES = (
-    'timeline_django.middleware.TimelineMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 
=== modified file 'src/oopstools/NEWS.txt'
--- src/oopstools/NEWS.txt	2012-09-20 05:46:48 +0000
+++ src/oopstools/NEWS.txt	2012-09-23 00:54:19 +0000
@@ -5,6 +5,11 @@
 NEXT
 ====
 
+0.6.5
+=====
+
+* Dependency bump to non-broken version of timeline-django. (Robert Collins)
+
 0.6.4
 =====
 
 
=== modified file 'src/oopstools/version.txt'
--- src/oopstools/version.txt	2012-09-20 05:46:48 +0000
+++ src/oopstools/version.txt	2012-09-23 00:54:19 +0000
@@ -1,1 +1,1 @@
-0.6.4
+0.6.5
 
=== modified file 'versions.cfg'
--- versions.cfg	2012-09-20 05:39:35 +0000
+++ versions.cfg	2012-09-23 00:54:19 +0000
@@ -31,7 +31,7 @@
 setuptools = 0.6c11
 testtools = 0.9.12
 timeline = 0.0.3
-timeline_django = 0.0.1
+timeline_django = 0.0.2
 z3c.recipe.filetemplate = 2.1.0
 z3c.recipe.sphinxdoc = 0.0.8
 z3c.recipe.tag = 0.4.0