I am merging all pending branches this week. Have done Alan's gradebook branches today. Great stuff!
2011/5/24, Alan Elkner <[email protected]>: > Justas, > > I put back level=2 and added a comment to help developers like myself > remember how to get to those tests. Could you please merge my branch > now? > > Thanks, > Alan > > On Fri, May 20, 2011 at 9:16 AM, Justas <[email protected]> wrote: >> On 05/20/2011 07:10 AM, Alan Elkner wrote: >>> >>> Hey Guys, >>> >>> I added some additional commits to my section_linkage branch, >>> lp:~aelkner/schooltool/term_linkage, to allow the user to specify in >>> the XLS import that they want sections with the same ID in other terms >>> to automatically be linked. It uses the cell that comes after the new >>> 'Link?' heading to see if there is a 'y' or 'yes' there (any >>> combination of upper or lower case) and links any such section to >>> sections in an adjacent term with the same ID. >>> >>> I changed the empty_data.xls file that users can use as a template to >>> have the new heading. Also, I expanded the help text to include an >>> explanation of what the heading is for. See the attached screenshot. >>> >>> When merging, please don't change schooltool/export/test_all.py to put >>> the ', level=2' back as that causes the import tests not to run. >> >> Ouch, please return these tests to the second level! They are slow and >> rarely needed for day-to-day runs of developers - that's why they were put >> there (by the way, they are always run by buildbots). You should run >> level >> two tests by specifying "--at-level 2" or "make testall". In any case, >> "make testall" is a thing to run before requesting a merge. >> >> Cheers, >> Justas >> >> >> _______________________________________________ >> Mailing list: https://launchpad.net/~schooltool-developers >> Post to : [email protected] >> Unsubscribe : https://launchpad.net/~schooltool-developers >> More help : https://help.launchpad.net/ListHelp >> > > _______________________________________________ > Mailing list: https://launchpad.net/~schooltool-developers > Post to : [email protected] > Unsubscribe : https://launchpad.net/~schooltool-developers > More help : https://help.launchpad.net/ListHelp > _______________________________________________ Mailing list: https://launchpad.net/~schooltool-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~schooltool-developers More help : https://help.launchpad.net/ListHelp
