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
=== modified file 'Makefile'
--- Makefile 2010-05-07 14:37:10 +0000
+++ Makefile 2010-05-10 03:44:25 +0000
@@ -1,4 +1,5 @@
1#!/usr/bin/make1#!/usr/bin/make
2<<<<<<< TREE
23
3PACKAGE=cando4PACKAGE=cando
45
@@ -6,6 +7,13 @@
67
7INSTANCE_TYPE=cando20078INSTANCE_TYPE=cando2007
8BUILDOUT_FLAGS=9BUILDOUT_FLAGS=
10=======
11#
12# Makefile for CanDo
13#
14
15BOOTSTRAP_PYTHON=python2.6
16>>>>>>> MERGE-SOURCE
917
10.PHONY: all18.PHONY: all
11all: build19all: build
@@ -27,6 +35,7 @@
27 svn up35 svn up
2836
29.PHONY: update37.PHONY: update
38<<<<<<< TREE
30update: bzrupdate39update: bzrupdate
31 $(MAKE) buildout BUILDOUT_FLAGS=-n40 $(MAKE) buildout BUILDOUT_FLAGS=-n
3241
@@ -57,6 +66,14 @@
57 rm -rf instance66 rm -rf instance
5867
59# Tests68# Tests
69=======
70update: build bzrupdate
71 bin/buildout -n
72
73.PHONY: make-instance
74make-instance:
75 bin/make-schooltool-instance instance instance_type=cando2007
76>>>>>>> MERGE-SOURCE
6077
61.PHONY: test78.PHONY: test
62test: build79test: build
6380
=== added file 'base.cfg'
--- base.cfg 1970-01-01 00:00:00 +0000
+++ base.cfg 2010-05-10 03:44:25 +0000
@@ -0,0 +1,35 @@
1[buildout]
2extends = http://ftp.schooltool.org/schooltool/1.4/versions.cfg
3versions = versions
4newest = false
5find-links = http://ftp.schooltool.org/schooltool/1.4/
6 http://ftp.schooltool.org/schooltool/1.4/dev/
7parts = package test scripts tags omelette
8
9[package]
10recipe = zc.recipe.egg:eggs
11unzip = true
12# set eggs to package name in buildout.cfg
13eggs =
14
15[scripts]
16recipe = zc.recipe.egg:scripts
17unzip = true
18eggs = ${package:eggs}
19 schooltool
20 schooltool.devtools
21 z3c.coverage
22 z3c.dependencychecker
23
24[test]
25recipe = zc.recipe.testrunner
26eggs = ${package:eggs}
27defaults = ['--tests-pattern', '^f?tests$', '-v', '--auto-color']
28
29[tags]
30recipe = z3c.recipe.tag:tags
31eggs = ${package:eggs}
32
33[omelette]
34recipe = collective.recipe.omelette
35eggs = ${package:eggs}
036
=== modified file 'buildout.cfg'
--- buildout.cfg 2009-11-23 16:49:30 +0000
+++ buildout.cfg 2010-05-10 03:44:25 +0000
@@ -1,30 +1,7 @@
1[buildout]1[buildout]
2extends = http://ftp.schooltool.org/schooltool/1.0/versions.cfg2extends = base.cfg
3versions = versions
4find-links = http://ftp.schooltool.org/schooltool/1.0
5use-dependency-links = false
6newest = false
7develop = .3develop = .
8parts = cando test scripts tags4
95[package]
10[cando]6eggs = cando
11recipe = zc.recipe.egg7
12unzip = true
13eggs = cando
14
15[scripts]
16recipe = zc.recipe.egg
17unzip = true
18eggs = cando
19 schooltool
20 schooltool.devtools
21 z3c.coverage
22
23[test]
24recipe = zc.recipe.testrunner
25eggs = cando
26defaults = ['--exit-with-status', '--tests-pattern', '^f?tests$', '-v']
27
28[tags]
29recipe = z3c.recipe.tag:tags
30eggs = cando
318
=== modified file 'setup.py'
--- setup.py 2010-03-10 16:43:23 +0000
+++ setup.py 2010-05-10 03:44:25 +0000
@@ -79,12 +79,12 @@
79 'z3c.formjs >= 0.4.1',79 'z3c.formjs >= 0.4.1',
80 'zope.app.generations',80 'zope.app.generations',
81 'zope.app.zcmlfiles',81 'zope.app.zcmlfiles',
82 'schooltool >= 1.0.5',82 'schooltool >= 1.3.0',
83 'schooltool.gradebook',83 'schooltool.gradebook>=0.6.0',
84 'PasteDeploy',84 'PasteDeploy',
85 'PasteScript',85 'PasteScript',
86 'rwproperty'],86 'rwproperty'],
87 dependency_links=['http://ftp.schooltool.org/schooltool/1.0'],87 dependency_links=['http://ftp.schooltool.org/schooltool/1.4/'],
88 entry_points = """88 entry_points = """
89 [schooltool.instance_type]89 [schooltool.instance_type]
90 cando2007 = cando.cando200790 cando2007 = cando.cando2007
9191
=== modified file 'src/cando/gradebook/browser/README.txt'
--- src/cando/gradebook/browser/README.txt 2010-03-10 16:43:23 +0000
+++ src/cando/gradebook/browser/README.txt 2010-05-10 03:44:25 +0000
@@ -2563,8 +2563,11 @@
2563 ... else:2563 ... else:
2564 ... True2564 ... True
2565 True2565 True
2566 >>> browser.headers['content-type']2566 >>> if pdf_enabled:
2567 'application/pdf'2567 ... browser.headers['content-type'] == 'application/pdf'
2568 ... else:
2569 ... browser.headers['content-type'] == 'text/html;charset=utf-8'
2570 True
2568 >>> browser.open(gradebook_url + '/certificate.rml')2571 >>> browser.open(gradebook_url + '/certificate.rml')
2569 >>> browser.printQuery('//story/para[@style="h1"]/text()')2572 >>> browser.printQuery('//story/para[@style="h1"]/text()')
2570 Chris2573 Chris
25712574
=== modified file 'src/cando/gradebook/browser/student.py'
--- src/cando/gradebook/browser/student.py 2010-03-10 16:43:23 +0000
+++ src/cando/gradebook/browser/student.py 2010-05-10 03:44:25 +0000
@@ -20,7 +20,7 @@
20#20#
2121
22from datetime import datetime22from datetime import datetime
23from zope.app.keyreference.interfaces import IKeyReference23from zope.keyreference.interfaces import IKeyReference
24from zope.interface import Interface24from zope.interface import Interface
25import zope.schema25import zope.schema
26from zope.publisher.browser import BrowserView26from zope.publisher.browser import BrowserView
2727
=== modified file 'src/cando/iep/README.txt'
--- src/cando/iep/README.txt 2010-03-10 16:43:23 +0000
+++ src/cando/iep/README.txt 2010-05-10 03:44:25 +0000
@@ -37,7 +37,7 @@
37different school years:37different school years:
3838
39 >>> iep_camila.competencies39 >>> iep_camila.competencies
40 <persistent.dict.PersistentDict object at ...>40 {}
4141
42These values are stored in the IBasicPerson's annotations under the42These values are stored in the IBasicPerson's annotations under the
43'cando.iep' key:43'cando.iep' key:
@@ -49,7 +49,7 @@
49 >>> camila_annotations['cando.iep'].get('comment')49 >>> camila_annotations['cando.iep'].get('comment')
50 u"Camila's IEP"50 u"Camila's IEP"
51 >>> camila_annotations['cando.iep'].get('competencies')51 >>> camila_annotations['cando.iep'].get('competencies')
52 <persistent.dict.PersistentDict object at ...>52 {}
5353
54 >>> marcela = BasicPerson("marcela", "Marcela", "Ortiz")54 >>> marcela = BasicPerson("marcela", "Marcela", "Ortiz")
55 >>> marcela_annotations = IAnnotations(marcela)55 >>> marcela_annotations = IAnnotations(marcela)
@@ -57,10 +57,11 @@
57 True57 True
58 >>> iep_marcela = IStudentIEP(marcela)58 >>> iep_marcela = IStudentIEP(marcela)
59 >>> marcela_annotations.get('cando.iep')59 >>> marcela_annotations.get('cando.iep')
60 <persistent.dict.PersistentDict object at ...>60 {'comment': None, 'competencies': {}, 'hasIEP': False}
61 >>> marcela_annotations['cando.iep'].get('hasIEP')61 >>> marcela_annotations['cando.iep'].get('hasIEP')
62 False62 False
63 >>> marcela_annotations['cando.iep'].get('comment') is None63 >>> marcela_annotations['cando.iep'].get('comment') is None
64 True64 True
65 >>> marcela_annotations['cando.iep'].get('competencies')65 >>> marcela_annotations['cando.iep'].get('competencies')
66 <persistent.dict.PersistentDict object at ...>66 {}
67
6768
=== modified file 'src/cando/message/message.py'
--- src/cando/message/message.py 2009-08-06 18:50:24 +0000
+++ src/cando/message/message.py 2010-05-10 03:44:25 +0000
@@ -29,7 +29,7 @@
29from zope.publisher.interfaces import NotFound, IPublishTraverse29from zope.publisher.interfaces import NotFound, IPublishTraverse
30from zope.location import location30from zope.location import location
31from zope.security import proxy31from zope.security import proxy
32from zope.app.keyreference.interfaces import IKeyReference32from zope.keyreference.interfaces import IKeyReference
3333
34from schooltool.course.interfaces import ISectionContainer34from schooltool.course.interfaces import ISectionContainer
35from schooltool.person.interfaces import IPerson35from schooltool.person.interfaces import IPerson
3636
=== modified file 'src/cando/message/tests.py'
--- src/cando/message/tests.py 2009-08-13 07:47:35 +0000
+++ src/cando/message/tests.py 2010-05-10 03:44:25 +0000
@@ -27,7 +27,7 @@
27import unittest27import unittest
28import zope.component28import zope.component
29from zope.testing import doctest29from zope.testing import doctest
30from zope.app.keyreference.interfaces import IKeyReference30from zope.keyreference.interfaces import IKeyReference
31from schooltool.relationship import tests as rel_tests31from schooltool.relationship import tests as rel_tests
3232
33class KeyReferenceStub(object):33class KeyReferenceStub(object):
3434
=== modified file 'src/cando/newskin/teacher.txt'
--- src/cando/newskin/teacher.txt 2009-01-09 07:37:58 +0000
+++ src/cando/newskin/teacher.txt 2010-05-10 03:44:25 +0000
@@ -289,10 +289,9 @@
289 ...Username:...teacher...289 ...Username:...teacher...
290 ...Details...290 ...Details...
291 ...Sections Taught...291 ...Sections Taught...
292 ...1, Teacher -- section1...292 ...course1 -- section1...
293 ...Groups...293 ...Groups...
294 ...Teachers...294 ...Teachers...
295 ...edit groups...
296295
297Now we will go all the way back and test the "Section-level Assignments"296Now we will go all the way back and test the "Section-level Assignments"
298button in the Assignments tab.297button in the Assignments tab.
@@ -377,11 +376,9 @@
377 >>> print teacher.contents376 >>> print teacher.contents
378 <BLANKLINE>377 <BLANKLINE>
379 ...Username:...teacher...378 ...Username:...teacher...
380 ...edit name...
381 ...Details...379 ...Details...
382 ...Groups...380 ...Groups...
383 ...Teachers...381 ...Teachers...
384 ...edit groups...
385382
386Test the Calendar button in the header.383Test the Calendar button in the header.
387 >>> teacher.getLink('Calendar').click()384 >>> teacher.getLink('Calendar').click()
388385
=== modified file 'src/cando/skilldriver/README.txt'
--- src/cando/skilldriver/README.txt 2009-02-28 19:30:44 +0000
+++ src/cando/skilldriver/README.txt 2010-05-10 03:44:25 +0000
@@ -428,7 +428,7 @@
428for that skill driver::428for that skill driver::
429429
430 >>> external_activity.getGrade(paul)430 >>> external_activity.getGrade(paul)
431 Decimal("0.83...")431 Decimal('0.83...')
432432
433If the student doesn't have a grade for that skill driver None should433If the student doesn't have a grade for that skill driver None should
434be returned::434be returned::
@@ -444,8 +444,9 @@
444 >>> external_activity.getGrade(claudia) is None444 >>> external_activity.getGrade(claudia) is None
445 False445 False
446 >>> external_activity.getGrade(claudia)446 >>> external_activity.getGrade(claudia)
447 Decimal("1")447 Decimal('1')
448 >>> gb.evaluate(claudia, c2, ss.fromUnicode(u'1'))448 >>> gb.evaluate(claudia, c2, ss.fromUnicode(u'1'))
449 <Evaluation for Competency(u'Comp122'), value=<UniversalScore u'1' 1 weight=1.0>>449 <Evaluation for Competency(u'Comp122'), value=<UniversalScore u'1' 1 weight=1.0>>
450 >>> external_activity.getGrade(claudia)450 >>> external_activity.getGrade(claudia)
451 Decimal("0.66...")
452\ No newline at end of file451\ No newline at end of file
452 Decimal('0.66...')
453
453454
=== modified file 'src/cando/skilldriver/tests.py'
--- src/cando/skilldriver/tests.py 2009-08-06 18:50:24 +0000
+++ src/cando/skilldriver/tests.py 2010-05-10 03:44:25 +0000
@@ -28,7 +28,7 @@
28import zope.component28import zope.component
29from zope.testing import doctest29from zope.testing import doctest
30from zope.app.testing import setup30from zope.app.testing import setup
31from zope.app.keyreference import testing31from zope.keyreference import testing
32from schooltool.requirement import testing as requirementTesting32from schooltool.requirement import testing as requirementTesting
33import schooltool.relationship.tests as relationship33import schooltool.relationship.tests as relationship
34from schooltool.course.interfaces import ICourse, ISection34from schooltool.course.interfaces import ICourse, ISection
3535
=== modified file 'src/cando/virginia/browser/README.txt'
--- src/cando/virginia/browser/README.txt 2009-11-24 16:41:50 +0000
+++ src/cando/virginia/browser/README.txt 2010-05-10 03:44:25 +0000
@@ -1149,9 +1149,9 @@
1149 ...Last name...1149 ...Last name...
1150 ...Carduner...1150 ...Carduner...
1151 </div>1151 </div>
1152 >>> browser.printQuery("//div[@class='info-block person-groups']/h5")1152 >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/h5")
1153 <h5>Groups</h5>1153 <h5>Groups</h5>
1154 >>> browser.printQuery("//div[@class='info-block person-groups']/ul/li/a/text()")1154 >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/div[@class='tree_list']/ul/li/ul/li/a/text()")
1155 Teachers1155 Teachers
11561156
1157Now, let's try the "Import Students" view in the Persons container:1157Now, let's try the "Import Students" view in the Persons container:
@@ -1276,9 +1276,9 @@
12761276
1277The view also adds people to the Students group:1277The view also adds people to the Students group:
12781278
1279 >>> browser.printQuery("//div[@class='info-block person-groups']/h5")1279 >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/h5")
1280 <h5>Groups</h5>1280 <h5>Groups</h5>
1281 >>> browser.printQuery("//div[@class='info-block person-groups']/ul/li/a/text()")1281 >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/div[@class='tree_list']/ul/li/ul/li/a/text()")
1282 Students1282 Students
1283 Teachers1283 Teachers
12841284
@@ -1371,9 +1371,9 @@
13711371
1372Tom's in the Students group:1372Tom's in the Students group:
13731373
1374 >>> browser.printQuery("//div[@class='info-block person-groups']/h5")1374 >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/h5")
1375 <h5>Groups</h5>1375 <h5>Groups</h5>
1376 >>> browser.printQuery("//div[@class='info-block person-groups']/ul/li/a/text()")1376 >>> browser.printQuery("//div[@class='info-block person-groups clearfix']/div[@class='tree_list']/ul/li/ul/li/a/text()")
1377 Students1377 Students
13781378
13791379
13801380
=== modified file 'src/cando/virginia/browser/configure.zcml'
--- src/cando/virginia/browser/configure.zcml 2009-11-19 03:59:52 +0000
+++ src/cando/virginia/browser/configure.zcml 2010-05-10 03:44:25 +0000
@@ -95,7 +95,7 @@
95 template="templates/competencies.pt"95 template="templates/competencies.pt"
96 permission="zope.View"96 permission="zope.View"
97 menu="zmi_views"97 menu="zmi_views"
98 title="View"98 title="Tree View"
99 />99 />
100100
101 <page101 <page
@@ -126,7 +126,7 @@
126 template="templates/virginiacompetency.pt"126 template="templates/virginiacompetency.pt"
127 permission="zope.View"127 permission="zope.View"
128 menu="zmi_views"128 menu="zmi_views"
129 title="View"129 title="Tree View"
130 />130 />
131131
132 <page132 <page

Subscribers

People subscribed via source and target branches

to all changes: