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

Proposed by Robert Collins
Status: Merged
Approved by: Robert Collins
Approved revision: no longer in the source branch.
Merged at revision: 45
Proposed branch: lp:~lifeless/python-oops-tools/deps
Merge into: lp:python-oops-tools
Diff against target: 81 lines (+14/-8)
5 files modified
buildout-templates/bin/oopstools.wsgi.in (+7/-5)
buildout-templates/src/oopstools/settings.py.in (+0/-1)
src/oopstools/NEWS.txt (+5/-0)
src/oopstools/version.txt (+1/-1)
versions.cfg (+1/-1)
To merge this branch: bzr merge lp:~lifeless/python-oops-tools/deps
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+125870@code.launchpad.net

Commit message

0.6.5 - use timeline-django 0.0.2.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

Simples.

review: Approve
lp:~lifeless/python-oops-tools/deps updated
45. By Robert Collins

0.6.5 - use timeline-django 0.0.2.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
14from oops_wsgi.django import OOPSWSGIHandler14from oops_wsgi.django import OOPSWSGIHandler
1515
16application = OOPSWSGIHandler()16application = OOPSWSGIHandler()
17from timeline_django.wsgi import make_app as timeline_django_make_app
17from timeline import wsgi as timeline_wsgi18from timeline import wsgi as timeline_wsgi
18from timeline_django.setup import setup_for_requests as timeline_django_setup19pplication = timeline_django_make_app(application)
19
20timeline_django_setup()
21application = timeline_wsgi.make_app(application)20application = timeline_wsgi.make_app(application)
2221
22from timeline_django import setup
23setup.setup_for_requests()
24
23# Report OOPSes back to us.25# Report OOPSes back to us.
24from functools import partial26from functools import partial
25from oops import Config27from oops import Config
@@ -36,9 +38,9 @@
3638
37# Attach the timeline to error reports39# Attach the timeline to error reports
38import oops_timeline40import oops_timeline
39from timeline_django.filters import install_hooks41import timeline_django.filters
40oops_timeline.install_hooks(config)42oops_timeline.install_hooks(config)
41install_hooks(config)43timeline_django.filters.install_hooks(config)
4244
43# Can add custom filters / hooks if needed - see docs.45# Can add custom filters / hooks if needed - see docs.
44factory = partial(amqp.Connection, host=settings.OOPS_WEB_AMQP_HOST,46factory = partial(amqp.Connection, host=settings.OOPS_WEB_AMQP_HOST,
4547
=== 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 @@
62)62)
6363
64MIDDLEWARE_CLASSES = (64MIDDLEWARE_CLASSES = (
65 'timeline_django.middleware.TimelineMiddleware',
66 'django.middleware.common.CommonMiddleware',65 'django.middleware.common.CommonMiddleware',
67 'django.contrib.sessions.middleware.SessionMiddleware',66 'django.contrib.sessions.middleware.SessionMiddleware',
68 'django.contrib.auth.middleware.AuthenticationMiddleware',67 'django.contrib.auth.middleware.AuthenticationMiddleware',
6968
=== 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 @@
5NEXT5NEXT
6====6====
77
80.6.5
9=====
10
11* Dependency bump to non-broken version of timeline-django. (Robert Collins)
12
80.6.4130.6.4
9=====14=====
1015
1116
=== 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 @@
10.6.410.6.5
22
=== 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 @@
31setuptools = 0.6c1131setuptools = 0.6c11
32testtools = 0.9.1232testtools = 0.9.12
33timeline = 0.0.333timeline = 0.0.3
34timeline_django = 0.0.134timeline_django = 0.0.2
35z3c.recipe.filetemplate = 2.1.035z3c.recipe.filetemplate = 2.1.0
36z3c.recipe.sphinxdoc = 0.0.836z3c.recipe.sphinxdoc = 0.0.8
37z3c.recipe.tag = 0.4.037z3c.recipe.tag = 0.4.0

Subscribers

People subscribed via source and target branches

to all changes: