Merge lp:~benji/lazr.restful/nail-versions into lp:lazr.restful

Proposed by Benji York on 2010-07-30
Status: Merged
Approved by: Gary Poster on 2010-08-06
Approved revision: 135
Merge reported by: Leonard Richardson
Merged at revision: not available
Proposed branch: lp:~benji/lazr.restful/nail-versions
Merge into: lp:lazr.restful
Diff against target: 251 lines (+69/-170)
2 files modified
src/lazr/restful/version.txt (+1/-1)
versions.cfg (+68/-169)
To merge this branch: bzr merge lp:~benji/lazr.restful/nail-versions
Reviewer Review Type Date Requested Status
Gary Poster 2010-07-30 Approve on 2010-08-06
Review via email: mp+31421@code.launchpad.net

Description of the Change

The lazr.restful trunk tests were failing because of some dependency that changed. This branch nails the versions so that doesn't happen any more. The versions used are primarily from the Launchpad project with unused packages culled and a few minor changes to remove LP-specific versions.

I had a pre-implementation discussion with Gary (gary).

To post a comment you must log in.
Gary Poster (gary) wrote :

Cool. :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/lazr/restful/version.txt'
2--- src/lazr/restful/version.txt 2010-06-14 15:29:08 +0000
3+++ src/lazr/restful/version.txt 2010-07-30 20:07:42 +0000
4@@ -1,1 +1,1 @@
5-0.9.29
6+0.10.0-dev
7
8=== modified file 'versions.cfg'
9--- versions.cfg 2009-04-15 14:43:40 +0000
10+++ versions.cfg 2010-07-30 20:07:42 +0000
11@@ -1,172 +1,71 @@
12+[buildout]
13+versions = versions
14+allow-picked-versions = false
15+use-dependency-links = false
16+
17+
18 [versions]
19-ClientForm = 0.2.9
20-RestrictedPython = 3.4.2
21-ZConfig = 2.5.1
22-ZODB3 = 3.8.1
23-docutils = 0.4
24-jquery.javascript = 1.0.0
25-jquery.layer = 1.0.0
26-lxml = 1.3.6
27-mechanize = 0.1.7b
28-pytz = 2007k
29-setuptools = 0.6c9
30-z3c.coverage = 1.1.2
31-z3c.csvvocabulary = 1.0.0
32-z3c.etestbrowser = 1.0.4
33-z3c.form = 1.9.0
34-z3c.formdemo = 1.5.3
35-z3c.formjs = 0.4.0
36-z3c.formjsdemo = 0.3.1
37-z3c.formui = 1.4.2
38-z3c.i18n = 0.1.1
39-z3c.layer = 0.2.3
40-z3c.macro = 1.1.0
41-z3c.macroviewlet = 1.0.0
42-z3c.menu = 0.2.0
43-z3c.optionstorage = 1.0.4
44-z3c.pagelet = 1.0.2
45-z3c.rml = 0.7.3
46-z3c.skin.pagelet = 1.0.2
47-z3c.template = 1.1.0
48-z3c.testing = 0.2.0
49-z3c.traverser = 0.2.3
50-z3c.viewlet = 1.0.0
51-z3c.viewtemplate = 0.3.2
52-z3c.zrtresource = 1.0.1
53-zc.buildout = 1.1.1
54-zc.catalog = 1.2.0
55-zc.datetimewidget = 0.5.2
56-zc.i18n = 0.5.2
57-zc.recipe.egg = 1.0.0
58-zc.recipe.filestorage = 1.0.0
59-zc.recipe.testrunner = 1.0.0
60-zc.resourcelibrary = 1.0.1
61-zc.table = 0.6
62-zc.zope3recipes = 0.6.2
63-zdaemon = 2.0.2
64-zodbcode = 3.4.0
65-zope.annotation = 3.4.1
66-zope.app.annotation = 3.4.0
67-zope.app.apidoc = 3.4.3
68-zope.app.applicationcontrol = 3.4.3
69-zope.app.appsetup = 3.4.1
70-zope.app.authentication = 3.4.4
71-zope.app.basicskin = 3.4.0
72-zope.app.boston = 3.4.0
73-zope.app.broken = 3.4.0
74-zope.app.cache = 3.4.1
75-zope.app.catalog = 3.5.1
76-zope.app.component = 3.4.1
77-zope.app.container = 3.5.6
78-zope.app.content = 3.4.0
79-zope.app.dav = 3.4.1
80-zope.app.debug = 3.4.1
81-zope.app.debugskin = 3.4.0
82-zope.app.dependable = 3.4.0
83-zope.app.dtmlpage = 3.4.1
84-zope.app.error = 3.5.1
85-zope.app.exception = 3.4.1
86-zope.app.externaleditor = 3.4.0
87-zope.app.file = 3.4.4
88-zope.app.folder = 3.4.0
89-zope.app.form = 3.4.1
90-zope.app.ftp = 3.4.0
91-zope.app.generations = 3.4.1
92-zope.app.homefolder = 3.4.0
93-zope.app.http = 3.4.1
94-zope.app.i18n = 3.4.4
95-zope.app.i18nfile = 3.4.1
96-zope.app.interface = 3.4.0
97-zope.app.interpreter = 3.4.0
98-zope.app.intid = 3.4.1
99-zope.app.keyreference = 3.4.1
100-zope.app.layers = 3.4.0
101-zope.app.locales = 3.4.5
102-zope.app.locking = 3.4.0
103-zope.app.module = 3.4.0
104-zope.app.onlinehelp = 3.4.1
105-zope.app.pagetemplate = 3.4.1
106-zope.app.pluggableauth = 3.4.0
107-zope.app.preference = 3.4.1
108-zope.app.preview = 3.4.0
109-zope.app.principalannotation = 3.4.0
110-zope.app.publication = 3.4.3
111-zope.app.publisher = 3.4.1
112-zope.app.pythonpage = 3.4.1
113-zope.app.renderer = 3.4.0
114-zope.app.rotterdam = 3.4.1
115-zope.app.schema = 3.4.0
116-zope.app.security = 3.5.2
117-zope.app.securitypolicy = 3.4.6
118-zope.app.server = 3.4.2
119-zope.app.session = 3.5.1
120-zope.app.skins = 3.4.0
121-zope.app.sqlscript = 3.4.1
122-zope.app.testing = 3.4.3
123-zope.app.traversing = 3.4.0
124-zope.app.tree = 3.4.0
125-zope.app.twisted = 3.4.1
126-zope.app.undo = 3.4.0
127-zope.app.wfmc = 0.1.2
128-zope.app.workflow = 3.4.1
129-zope.app.wsgi = 3.4.1
130-zope.app.xmlrpcintrospection = 3.4.0
131-zope.app.zapi = 3.4.0
132-zope.app.zcmlfiles = 3.4.3
133-zope.app.zopeappgenerations = 3.4.0
134-zope.app.zptpage = 3.4.1
135-zope.cachedescriptors = 3.4.1
136-zope.component = 3.4.0
137-zope.configuration = 3.4.0
138-zope.contentprovider = 3.4.0
139-zope.contenttype = 3.4.0
140-zope.copypastemove = 3.4.0
141+# Alphabetical, case-SENSITIVE, blank line after this comment
142+
143+Jinja2 = 2.5
144+Pygments = 1.3.1
145+RestrictedPython = 3.5.1
146+Sphinx = 1.0.1
147+ZConfig = 2.7.1
148+ZODB3 = 3.9.2
149+docutils = 0.5
150+epydoc = 3.0.1
151+grokcore.component = 1.6
152+lazr.batchnavigator = 1.1.1
153+lazr.delegates = 1.1.0
154+lazr.enum = 1.1.2
155+lazr.lifecycle = 1.0
156+lazr.restful = 0.9.29
157+lazr.uri = 1.0.2
158+lxml = 2.2.7
159+martian = 0.11
160+pytz = 2010h
161+setuptools = 0.6c11
162+simplejson = 2.0.9
163+transaction = 1.0.0
164+van.testing = 2.0.1
165+wsgi-intercept = 0.4
166+wsgiref = 0.1.2
167+z3c.recipe.sphinxdoc = 0.0.8
168+z3c.recipe.staticlxml = 0.7.1
169+z3c.recipe.tag = 0.2.0
170+zc.buildout = 1.4.3
171+zc.lockfile = 1.0.0
172+zc.recipe.cmmi = 1.3.1
173+zc.recipe.egg = 1.2.3b2
174+zc.recipe.testrunner = 1.3.0
175+zdaemon = 2.0.4
176+zope.annotation = 3.5.0
177+zope.app.pagetemplate = 3.7.1
178+zope.browser = 1.2
179+zope.cachedescriptors = 3.5.0
180+zope.component = 3.9.3
181+zope.configuration = 3.6.0
182+zope.contenttype = 3.5.0
183+zope.copy = 3.5.0
184 zope.datetime = 3.4.0
185-zope.decorator = 3.4.0
186-zope.deferredimport = 3.4.0
187-zope.deprecation = 3.4.0
188-zope.documenttemplate = 3.4.0
189-zope.dottedname = 3.4.2
190-zope.dublincore = 3.4.0
191-zope.error = 3.5.1
192-zope.event = 3.4.0
193-zope.exceptions = 3.4.0
194-zope.file = 0.3.0
195-zope.filerepresentation = 3.4.0
196-zope.formlib = 3.4.0
197-zope.hookable = 3.4.0
198-zope.html = 1.0.1
199-zope.i18n = 3.4.0
200-zope.i18nmessageid = 3.4.3
201-zope.index = 3.4.1
202-zope.interface = 3.4.1
203-zope.lifecycleevent = 3.4.0
204-zope.location = 3.4.0
205-zope.mimetype = 0.3.0
206-zope.minmax = 1.1.0
207-zope.modulealias = 3.4.0
208-zope.pagetemplate = 3.4.0
209-zope.proxy = 3.4.2
210-zope.publisher = 3.4.6
211-zope.rdb = 3.4.0
212-zope.schema = 3.4.0
213-zope.security = 3.4.1
214-zope.securitypolicy = 3.4.1
215-zope.sendmail = 3.4.0
216-zope.sequencesort = 3.4.0
217-zope.server = 3.4.3
218-zope.session = 3.4.1
219-zope.size = 3.4.0
220-zope.structuredtext = 3.4.0
221-zope.tal = 3.4.1
222+zope.dublincore = 3.5.0
223+zope.event = 3.4.1
224+zope.exceptions = 3.5.2
225+zope.hookable = 3.4.1
226+zope.i18n = 3.7.1
227+zope.i18nmessageid = 3.5.0
228+zope.interface = 3.5.2
229+zope.lifecycleevent = 3.5.2
230+zope.location = 3.7.0
231+zope.pagetemplate = 3.5.0
232+zope.proxy = 3.5.0
233+zope.publisher = 3.12.0
234+zope.schema = 3.5.4
235+zope.security = 3.7.1
236+zope.size = 3.4.1
237+zope.tal = 3.5.1
238 zope.tales = 3.4.0
239-zope.testbrowser = 3.4.2
240-zope.testing = 3.5.6
241-zope.testrecorder = 0.3.0
242-zope.thread = 3.4
243-zope.traversing = 3.6.0
244-zope.ucol = 1.0.2
245-zope.viewlet = 3.4.2
246-zope.wfmc = 3.4.0
247-zope.xmlpickle = 3.4.0
248-van.testing = 2.0.1
249+zope.testing = 3.9.4
250+zope.testrunner = 4.0.0b5
251+zope.traversing = 3.8.0

Subscribers

People subscribed via source and target branches