On 5/5/11 9:06 AM, Jeroen Demeyer wrote:
Hi all,I recently adapted the merge scripts to deal with spkg's in a new way. Most importantly, changes inside a spkg are automatically *committed* before merging the spkg into Sage (the spkg is extracted, hg commit is done using a commit message coming from SPKG.txt, an hg tag is added and the spkg is repacked). I hope this will make authoring and reviewing spkg's slightly easier. This implies that a merged spkg is no longer byte-for-byte identical to the spkg made by a ticket author. The new script also adds several sanity checks for a spkg: 1) Inside the spkg, there must be a top-level directory whose name is the same as the spkg, but with the extension ".spkg" removed. 2) SPKG.txt must contain a line of the form === cliquer-1.2.p9 (Jeroen Demeyer, 4 May 2011) === (more precisely, it must match /^==* ${spkg_name_and_version} /) 3) There must also be such a line for the previous spkg version (e.g. any future numpy spkg must mention "numpy-1.5.1" in its SPKG.txt, which is the version currently in Sage). This is to ensure that a spkg is based on the most recent version. 4) SPKG.txt and spkg-install must be under hg control. Further ideas, suggestions, complaints are welcome.
I agree with the sentiment expressed elsewhere in previous threads that the changelog should be in the hg log, and not necessarily in the SPKG.txt file. In other words, I feel like the changes you made should be reversed---the hg log messages should be insisted on, and the changelog inside the SPKG.txt should be generated from the hg log. But it doesn't matter enough to me to change what you've done.
Thanks, Jason -- To post to this group, send an email to [email protected] To unsubscribe from this group, send an email to [email protected] For more options, visit this group at http://groups.google.com/group/sage-devel URL: http://www.sagemath.org
