CanDo

Merge lp:~aelkner/cando/lucid_release into lp:~vcs-imports/cando/trunk

  1. lucid_release
  2. Merge into trunk
Proposed by Alan Elkner
Status: Needs review
Proposed branch: lp:~aelkner/cando/lucid_release
Merge into: lp:~vcs-imports/cando/trunk
Diff against target: 368 lines (+87/-56) (has conflicts)
14 files modified
Makefile (+17/-0)
base.cfg (+35/-0)
buildout.cfg (+5/-28)
setup.py (+3/-3)
src/cando/gradebook/browser/README.txt (+5/-2)
src/cando/gradebook/browser/student.py (+1/-1)
src/cando/iep/README.txt (+5/-4)
src/cando/message/message.py (+1/-1)
src/cando/message/tests.py (+1/-1)
src/cando/newskin/teacher.txt (+1/-4)
src/cando/skilldriver/README.txt (+4/-3)
src/cando/skilldriver/tests.py (+1/-1)
src/cando/virginia/browser/README.txt (+6/-6)
src/cando/virginia/browser/configure.zcml (+2/-2)
Text conflict in Makefile
To merge this branch: bzr merge lp:~aelkner/cando/lucid_release
Reviewer Review Type Date Requested Status
Gediminas Paulauskas (community) Approve
VCS imports Pending
Review via email: mp+24970@code.launchpad.net

Description of the change

Hey Guys,

I know you're all going to be in transit at some point in the next couple of days, but at your earliest possible convenience, could you please merge this branch and create the lucid package for cando? One of our partners at one of my grants needs to demonstrate cando in a proposal early this week. I know this is last minute, but if you can, that would make a big difference to our partner.

Thanks,
Alan

To post a comment you must log in.
Revision history for this message
Gediminas Paulauskas (menesis) wrote :

Oops, that was much later than "next week". I have applied your changes to svn trunk now.

review: Approve
Reply

Unmerged revisions

1020. By Alan Elkner <aelkner@ubuntu>

fixes for lucid release

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2010-05-07 14:37:10 +0000
3+++ Makefile 2010-05-10 03:44:25 +0000
4@@ -1,4 +1,5 @@
5 #!/usr/bin/make
6+<<<<<<< TREE
7
8 PACKAGE=cando
9
10@@ -6,6 +7,13 @@
11
12 INSTANCE_TYPE=cando2007
13 BUILDOUT_FLAGS=
14+=======
15+#
16+# Makefile for CanDo
17+#
18+
19+BOOTSTRAP_PYTHON=python2.6
20+>>>>>>> MERGE-SOURCE
21
22 .PHONY: all
23 all: build
24@@ -27,6 +35,7 @@
25 svn up
26
27 .PHONY: update
28+<<<<<<< TREE
29 update: bzrupdate
30 $(MAKE) buildout BUILDOUT_FLAGS=-n
31
32@@ -57,6 +66,14 @@
33 rm -rf instance
34
35 # Tests
36+=======
37+update: build bzrupdate
38+ bin/buildout -n
39+
40+.PHONY: make-instance
41+make-instance:
42+ bin/make-schooltool-instance instance instance_type=cando2007
43+>>>>>>> MERGE-SOURCE
44
45 .PHONY: test
46 test: build
47
48=== added file 'base.cfg'
49--- base.cfg 1970-01-01 00:00:00 +0000
50+++ base.cfg 2010-05-10 03:44:25 +0000
51@@ -0,0 +1,35 @@
52+[buildout]
53+extends = http://ftp.schooltool.org/schooltool/1.4/versions.cfg
54+versions = versions
55+newest = false
56+find-links = http://ftp.schooltool.org/schooltool/1.4/
57+ http://ftp.schooltool.org/schooltool/1.4/dev/
58+parts = package test scripts tags omelette
59+
60+[package]
61+recipe = zc.recipe.egg:eggs
62+unzip = true
63+# set eggs to package name in buildout.cfg
64+eggs =
65+
66+[scripts]
67+recipe = zc.recipe.egg:scripts
68+unzip = true
69+eggs = ${package:eggs}
70+ schooltool
71+ schooltool.devtools
72+ z3c.coverage
73+ z3c.dependencychecker
74+
75+[test]
76+recipe = zc.recipe.testrunner
77+eggs = ${package:eggs}
78+defaults = ['--tests-pattern', '^f?tests$', '-v', '--auto-color']
79+
80+[tags]
81+recipe = z3c.recipe.tag:tags
82+eggs = ${package:eggs}
83+
84+[omelette]
85+recipe = collective.recipe.omelette
86+eggs = ${package:eggs}
87
88=== modified file 'buildout.cfg'
89--- buildout.cfg 2009-11-23 16:49:30 +0000
90+++ buildout.cfg 2010-05-10 03:44:25 +0000
91@@ -1,30 +1,7 @@
92 [buildout]
93-extends = http://ftp.schooltool.org/schooltool/1.0/versions.cfg
94-versions = versions
95-find-links = http://ftp.schooltool.org/schooltool/1.0
96-use-dependency-links = false
97-newest = false
98+extends = base.cfg
99 develop = .
100-parts = cando test scripts tags
101-
102-[cando]
103-recipe = zc.recipe.egg
104-unzip = true
105-eggs = cando
106-
107-[scripts]
108-recipe = zc.recipe.egg
109-unzip = true
110-eggs = cando
111- schooltool
112- schooltool.devtools
113- z3c.coverage
114-
115-[test]
116-recipe = zc.recipe.testrunner
117-eggs = cando
118-defaults = ['--exit-with-status', '--tests-pattern', '^f?tests$', '-v']
119-
120-[tags]
121-recipe = z3c.recipe.tag:tags
122-eggs = cando
123+
124+[package]
125+eggs = cando
126+
127
128=== modified file 'setup.py'
129--- setup.py 2010-03-10 16:43:23 +0000
130+++ setup.py 2010-05-10 03:44:25 +0000
131@@ -79,12 +79,12 @@
132 'z3c.formjs >= 0.4.1',
133 'zope.app.generations',
134 'zope.app.zcmlfiles',
135- 'schooltool >= 1.0.5',
136- 'schooltool.gradebook',
137+ 'schooltool >= 1.3.0',
138+ 'schooltool.gradebook>=0.6.0',
139 'PasteDeploy',
140 'PasteScript',
141 'rwproperty'],
142- dependency_links=['http://ftp.schooltool.org/schooltool/1.0'],
143+ dependency_links=['http://ftp.schooltool.org/schooltool/1.4/'],
144 entry_points = """
145 [schooltool.instance_type]
146 cando2007 = cando.cando2007
147
148=== modified file 'src/cando/gradebook/browser/README.txt'
149--- src/cando/gradebook/browser/README.txt 2010-03-10 16:43:23 +0000
150+++ src/cando/gradebook/browser/README.txt 2010-05-10 03:44:25 +0000
151@@ -2563,8 +2563,11 @@
152 ... else:
153 ... True
154 True
155- >>> browser.headers['content-type']
156- 'application/pdf'
157+ >>> if pdf_enabled:
158+ ... browser.headers['content-type'] == 'application/pdf'
159+ ... else:
160+ ... browser.headers['content-type'] == 'text/html;charset=utf-8'
161+ True
162 >>> browser.open(gradebook_url + '/certificate.rml')
163 >>> browser.printQuery('//story/para[@style="h1"]/text()')
164 Chris
165
166=== modified file 'src/cando/gradebook/browser/student.py'
167--- src/cando/gradebook/browser/student.py 2010-03-10 16:43:23 +0000
168+++ src/cando/gradebook/browser/student.py 2010-05-10 03:44:25 +0000
169@@ -20,7 +20,7 @@
170 #
171
172 from datetime import datetime
173-from zope.app.keyreference.interfaces import IKeyReference
174+from zope.keyreference.interfaces import IKeyReference
175 from zope.interface import Interface
176 import zope.schema
177 from zope.publisher.browser import BrowserView
178
179=== modified file 'src/cando/iep/README.txt'
180--- src/cando/iep/README.txt 2010-03-10 16:43:23 +0000
181+++ src/cando/iep/README.txt 2010-05-10 03:44:25 +0000
182@@ -37,7 +37,7 @@
183 different school years:
184
185 >>> iep_camila.competencies
186- <persistent.dict.PersistentDict object at ...>
187+ {}
188
189 These values are stored in the IBasicPerson's annotations under the
190 'cando.iep' key:
191@@ -49,7 +49,7 @@
192 >>> camila_annotations['cando.iep'].get('comment')
193 u"Camila's IEP"
194 >>> camila_annotations['cando.iep'].get('competencies')
195- <persistent.dict.PersistentDict object at ...>
196+ {}
197
198 >>> marcela = BasicPerson("marcela", "Marcela", "Ortiz")
199 >>> marcela_annotations = IAnnotations(marcela)
200@@ -57,10 +57,11 @@
201 True
202 >>> iep_marcela = IStudentIEP(marcela)
203 >>> marcela_annotations.get('cando.iep')
204- <persistent.dict.PersistentDict object at ...>
205+ {'comment': None, 'competencies': {}, 'hasIEP': False}
206 >>> marcela_annotations['cando.iep'].get('hasIEP')
207 False
208 >>> marcela_annotations['cando.iep'].get('comment') is None
209 True
210 >>> marcela_annotations['cando.iep'].get('competencies')
211- <persistent.dict.PersistentDict object at ...>
212+ {}
213+
214
215=== modified file 'src/cando/message/message.py'
216--- src/cando/message/message.py 2009-08-06 18:50:24 +0000
217+++ src/cando/message/message.py 2010-05-10 03:44:25 +0000
218@@ -29,7 +29,7 @@
219 from zope.publisher.interfaces import NotFound, IPublishTraverse
220 from zope.location import location
221 from zope.security import proxy
222-from zope.app.keyreference.interfaces import IKeyReference
223+from zope.keyreference.interfaces import IKeyReference
224
225 from schooltool.course.interfaces import ISectionContainer
226 from schooltool.person.interfaces import IPerson
227
228=== modified file 'src/cando/message/tests.py'
229--- src/cando/message/tests.py 2009-08-13 07:47:35 +0000
230+++ src/cando/message/tests.py 2010-05-10 03:44:25 +0000
231@@ -27,7 +27,7 @@
232 import unittest
233 import zope.component
234 from zope.testing import doctest
235-from zope.app.keyreference.interfaces import IKeyReference
236+from zope.keyreference.interfaces import IKeyReference
237 from schooltool.relationship import tests as rel_tests
238
239 class KeyReferenceStub(object):
240
241=== modified file 'src/cando/newskin/teacher.txt'
242--- src/cando/newskin/teacher.txt 2009-01-09 07:37:58 +0000
243+++ src/cando/newskin/teacher.txt 2010-05-10 03:44:25 +0000
244@@ -289,10 +289,9 @@
245 ...Username:...teacher...
246 ...Details...
247 ...Sections Taught...
248- ...1, Teacher -- section1...
249+ ...course1 -- section1...
250 ...Groups...
251 ...Teachers...
252- ...edit groups...
253
254 Now we will go all the way back and test the "Section-level Assignments"
255 button in the Assignments tab.
256@@ -377,11 +376,9 @@
257 >>> print teacher.contents
258 <BLANKLINE>
259 ...Username:...teacher...
260- ...edit name...
261 ...Details...
262 ...Groups...
263 ...Teachers...
264- ...edit groups...
265
266 Test the Calendar button in the header.
267 >>> teacher.getLink('Calendar').click()
268
269=== modified file 'src/cando/skilldriver/README.txt'
270--- src/cando/skilldriver/README.txt 2009-02-28 19:30:44 +0000
271+++ src/cando/skilldriver/README.txt 2010-05-10 03:44:25 +0000
272@@ -428,7 +428,7 @@
273 for that skill driver::
274
275 >>> external_activity.getGrade(paul)
276- Decimal("0.83...")
277+ Decimal('0.83...')
278
279 If the student doesn't have a grade for that skill driver None should
280 be returned::
281@@ -444,8 +444,9 @@
282 >>> external_activity.getGrade(claudia) is None
283 False
284 >>> external_activity.getGrade(claudia)
285- Decimal("1")
286+ Decimal('1')
287 >>> gb.evaluate(claudia, c2, ss.fromUnicode(u'1'))
288 <Evaluation for Competency(u'Comp122'), value=<UniversalScore u'1' 1 weight=1.0>>
289 >>> external_activity.getGrade(claudia)
290- Decimal("0.66...")
291\ No newline at end of file
292+ Decimal('0.66...')
293+
294
295=== modified file 'src/cando/skilldriver/tests.py'
296--- src/cando/skilldriver/tests.py 2009-08-06 18:50:24 +0000
297+++ src/cando/skilldriver/tests.py 2010-05-10 03:44:25 +0000
298@@ -28,7 +28,7 @@
299 import zope.component
300 from zope.testing import doctest
301 from zope.app.testing import setup
302-from zope.app.keyreference import testing
303+from zope.keyreference import testing
304 from schooltool.requirement import testing as requirementTesting
305 import schooltool.relationship.tests as relationship
306 from schooltool.course.interfaces import ICourse, ISection
307
308=== modified file 'src/cando/virginia/browser/README.txt'
309--- src/cando/virginia/browser/README.txt 2009-11-24 16:41:50 +0000
310+++ src/cando/virginia/browser/README.txt 2010-05-10 03:44:25 +0000
311@@ -1149,9 +1149,9 @@
312 ...Last name...
313 ...Carduner...
314 </div>
315- >>> browser.printQuery("//div[@class='info-block person-groups']/h5")
316+ >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/h5")
317 <h5>Groups</h5>
318- >>> browser.printQuery("//div[@class='info-block person-groups']/ul/li/a/text()")
319+ >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/div[@class='tree_list']/ul/li/ul/li/a/text()")
320 Teachers
321
322 Now, let's try the "Import Students" view in the Persons container:
323@@ -1276,9 +1276,9 @@
324
325 The view also adds people to the Students group:
326
327- >>> browser.printQuery("//div[@class='info-block person-groups']/h5")
328+ >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/h5")
329 <h5>Groups</h5>
330- >>> browser.printQuery("//div[@class='info-block person-groups']/ul/li/a/text()")
331+ >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/div[@class='tree_list']/ul/li/ul/li/a/text()")
332 Students
333 Teachers
334
335@@ -1371,9 +1371,9 @@
336
337 Tom's in the Students group:
338
339- >>> browser.printQuery("//div[@class='info-block person-groups']/h5")
340+ >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/h5")
341 <h5>Groups</h5>
342- >>> browser.printQuery("//div[@class='info-block person-groups']/ul/li/a/text()")
343+ >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/div[@class='tree_list']/ul/li/ul/li/a/text()")
344 Students
345
346
347
348=== modified file 'src/cando/virginia/browser/configure.zcml'
349--- src/cando/virginia/browser/configure.zcml 2009-11-19 03:59:52 +0000
350+++ src/cando/virginia/browser/configure.zcml 2010-05-10 03:44:25 +0000
351@@ -95,7 +95,7 @@
352 template="templates/competencies.pt"
353 permission="zope.View"
354 menu="zmi_views"
355- title="View"
356+ title="Tree View"
357 />
358
359 <page
360@@ -126,7 +126,7 @@
361 template="templates/virginiacompetency.pt"
362 permission="zope.View"
363 menu="zmi_views"
364- title="View"
365+ title="Tree View"
366 />
367
368 <page

Subscribers

People subscribed via source and target branches

to all changes: