Author: bugman Date: Thu Nov 9 04:31:34 2006 New Revision: 2779 URL: http://svn.gna.org/viewcvs/relax?rev=2779&view=rev Log: Ported r2745, r2746, and r2778 from the 1.2 line. The commands used were: svn merge -r2744:2746 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2 svn merge -r2777:2778 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2 This includes editing of the release checklist file, a spell check of the CHANGES file, and the fix to bug #7677 (https://gna.org/bugs/index.php?7677). Modified: 1.3/docs/CHANGES 1.3/docs/Release_Checklist 1.3/relax Modified: 1.3/docs/CHANGES URL: http://svn.gna.org/viewcvs/relax/1.3/docs/CHANGES?rev=2779&r1=2778&r2=2779&view=diff ============================================================================== --- 1.3/docs/CHANGES (original) +++ 1.3/docs/CHANGES Thu Nov 9 04:31:34 2006 @@ -23,7 +23,7 @@ * Model elimination when using the model-free model 'm0' no longer fails. (bug #7226) * The strict checking of the Da and Dr diffusion tensor parameters has been relaxed to allow for optimisation imprecision. (bug #7297) * The reading of Modelfree4 mfout results files no longer fails when residue specific relaxation data is missing (corrupt input data). (bug #7277) - * If optimisation returns an infinit value or a NaN value, these are now caught and a RelaxError thrown. (bug #6503, task #3621) + * If optimisation returns an infinite value or a NaN value, these are now caught and a RelaxError thrown. (bug #6503, task #3621) * The sigma(NOE) equations of Chapter 8 of the manual have been fixed. (bug #7402) * Files containing relaxation data not consisting of exactly 4 columns will now be read. (bug #7583) * Model-free results files from relax versions prior to 1.2.5 are now properly read. (bug #7587) Modified: 1.3/docs/Release_Checklist URL: http://svn.gna.org/viewcvs/relax/1.3/docs/Release_Checklist?rev=2779&r1=2778&r2=2779&view=diff ============================================================================== --- 1.3/docs/Release_Checklist (original) +++ 1.3/docs/Release_Checklist Thu Nov 9 04:31:34 2006 @@ -2,7 +2,7 @@ $ svn cp svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/1.2.4 -In the commit message, have a header line which says 'relax version 1.2.4.', followed by a description of the release. +In the commit message, have a header line which says 'relax version 1.2.4.', followed by a short description of the release. @@ -39,7 +39,7 @@ * Modify the http://nmr-relax.com download page to point to the newest version of relax. Update the MD5 checksums and file sizes on the download page. Create the HTML version of the manual with the command: -$ scons manual_html +$ scons user_manual_html Replace the old manual with the new in the CVS homepage repository and commit both the download page and new manual. Modified: 1.3/relax URL: http://svn.gna.org/viewcvs/relax/1.3/relax?rev=2779&r1=2778&r2=2779&view=diff ============================================================================== --- 1.3/relax (original) +++ 1.3/relax Thu Nov 9 04:31:34 2006 @@ -453,7 +453,7 @@ if not profile_flag: Relax() else: - def print_stats(stats): + def print_stats(stats, status=0): pstats.Stats(stats).sort_stats('time', 'name').print_stats() profile.Profile.print_stats = print_stats