python-oops-tools

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

  1. deps
  2. Merge into trunk
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
1=== modified file 'buildout-templates/bin/oopstools.wsgi.in'
2--- buildout-templates/bin/oopstools.wsgi.in 2012-09-14 10:51:58 +0000
3+++ buildout-templates/bin/oopstools.wsgi.in 2012-09-23 00:54:19 +0000
4@@ -14,12 +14,14 @@
5 from oops_wsgi.django import OOPSWSGIHandler
6
7 application = OOPSWSGIHandler()
8+from timeline_django.wsgi import make_app as timeline_django_make_app
9 from timeline import wsgi as timeline_wsgi
10-from timeline_django.setup import setup_for_requests as timeline_django_setup
11-
12-timeline_django_setup()
13+pplication = timeline_django_make_app(application)
14 application = timeline_wsgi.make_app(application)
15
16+from timeline_django import setup
17+setup.setup_for_requests()
18+
19 # Report OOPSes back to us.
20 from functools import partial
21 from oops import Config
22@@ -36,9 +38,9 @@
23
24 # Attach the timeline to error reports
25 import oops_timeline
26-from timeline_django.filters import install_hooks
27+import timeline_django.filters
28 oops_timeline.install_hooks(config)
29-install_hooks(config)
30+timeline_django.filters.install_hooks(config)
31
32 # Can add custom filters / hooks if needed - see docs.
33 factory = partial(amqp.Connection, host=settings.OOPS_WEB_AMQP_HOST,
34
35=== modified file 'buildout-templates/src/oopstools/settings.py.in'
36--- buildout-templates/src/oopstools/settings.py.in 2012-09-14 10:51:58 +0000
37+++ buildout-templates/src/oopstools/settings.py.in 2012-09-23 00:54:19 +0000
38@@ -62,7 +62,6 @@
39 )
40
41 MIDDLEWARE_CLASSES = (
42- 'timeline_django.middleware.TimelineMiddleware',
43 'django.middleware.common.CommonMiddleware',
44 'django.contrib.sessions.middleware.SessionMiddleware',
45 'django.contrib.auth.middleware.AuthenticationMiddleware',
46
47=== modified file 'src/oopstools/NEWS.txt'
48--- src/oopstools/NEWS.txt 2012-09-20 05:46:48 +0000
49+++ src/oopstools/NEWS.txt 2012-09-23 00:54:19 +0000
50@@ -5,6 +5,11 @@
51 NEXT
52 ====
53
54+0.6.5
55+=====
56+
57+* Dependency bump to non-broken version of timeline-django. (Robert Collins)
58+
59 0.6.4
60 =====
61
62
63=== modified file 'src/oopstools/version.txt'
64--- src/oopstools/version.txt 2012-09-20 05:46:48 +0000
65+++ src/oopstools/version.txt 2012-09-23 00:54:19 +0000
66@@ -1,1 +1,1 @@
67-0.6.4
68+0.6.5
69
70=== modified file 'versions.cfg'
71--- versions.cfg 2012-09-20 05:39:35 +0000
72+++ versions.cfg 2012-09-23 00:54:19 +0000
73@@ -31,7 +31,7 @@
74 setuptools = 0.6c11
75 testtools = 0.9.12
76 timeline = 0.0.3
77-timeline_django = 0.0.1
78+timeline_django = 0.0.2
79 z3c.recipe.filetemplate = 2.1.0
80 z3c.recipe.sphinxdoc = 0.0.8
81 z3c.recipe.tag = 0.4.0

Subscribers

People subscribed via source and target branches

to all changes: