Author: bugman Date: Mon Jan 28 11:51:38 2013 New Revision: 18327 URL: http://svn.gna.org/viewcvs/relax?rev=18327&view=rev Log: Merged revisions 18309,18312,18314,18321-18326 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r18309 | bugman | 2013-01-27 14:30:43 +0100 (Sun, 27 Jan 2013) | 3 lines The N_state_model.test_populations system test has been made less stringent to allow MS Windows to pass. ........ r18312 | bugman | 2013-01-27 18:10:01 +0100 (Sun, 27 Jan 2013) | 3 lines Trailing whitespace removal in the CHANGES document. ........ r18314 | bugman | 2013-01-27 19:23:22 +0100 (Sun, 27 Jan 2013) | 6 lines Merged the relax version 2.2.0 CHANGES file back to trunk. The command used was: svn merge -r18312:18313 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/2.2.0 . ........ r18321 | bugman | 2013-01-28 10:10:59 +0100 (Mon, 28 Jan 2013) | 3 lines Python 3 fix for a print statement in the metal_pos_opt.py N-state model system test script. ........ r18322 | bugman | 2013-01-28 10:11:59 +0100 (Mon, 28 Jan 2013) | 5 lines Replaced a reference to freshmeat with Freecode in the Release checklist document. Freshmeat no longer exists and is now called Freecode (http://freecode.com/projects/nmr-relax). ........ r18323 | bugman | 2013-01-28 10:52:07 +0100 (Mon, 28 Jan 2013) | 3 lines Python 3 fix for the part of ScientificPython distributed with relax (for the PDB parser). ........ r18324 | bugman | 2013-01-28 10:53:01 +0100 (Mon, 28 Jan 2013) | 3 lines Python 3 import fixes for the GUI. ........ r18325 | bugman | 2013-01-28 11:09:35 +0100 (Mon, 28 Jan 2013) | 3 lines The GUI tests base class module now uses the Python 2/3 relax compat module. ........ r18326 | bugman | 2013-01-28 11:17:55 +0100 (Mon, 28 Jan 2013) | 3 lines Python 3 fixes for the list sort() method - this has been replaced by the builtin sorted() function. ........ Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/docs/CHANGES branches/frame_order_testing/docs/Release_Checklist branches/frame_order_testing/extern/scientific_python/Geometry/TensorModule.py branches/frame_order_testing/gui/analyses/auto_r1.py branches/frame_order_testing/gui/analyses/auto_r2.py branches/frame_order_testing/test_suite/gui_tests/base_classes.py branches/frame_order_testing/test_suite/system_tests/n_state_model.py branches/frame_order_testing/test_suite/system_tests/pipes.py branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/frame_order_testing/docs/CHANGES URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/docs/CHANGES?rev=18327&r1=18326&r2=18327&view=diff Modified: branches/frame_order_testing/docs/Release_Checklist URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/docs/Release_Checklist?rev=18327&r1=18326&r2=18327&view=diff Modified: branches/frame_order_testing/extern/scientific_python/Geometry/TensorModule.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/extern/scientific_python/Geometry/TensorModule.py?rev=18327&r1=18326&r2=18327&view=diff Modified: branches/frame_order_testing/gui/analyses/auto_r1.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/analyses/auto_r1.py?rev=18327&r1=18326&r2=18327&view=diff Modified: branches/frame_order_testing/gui/analyses/auto_r2.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/analyses/auto_r2.py?rev=18327&r1=18326&r2=18327&view=diff Modified: branches/frame_order_testing/test_suite/gui_tests/base_classes.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/gui_tests/base_classes.py?rev=18327&r1=18326&r2=18327&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/n_state_model.py?rev=18327&r1=18326&r2=18327&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/pipes.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/pipes.py?rev=18327&r1=18326&r2=18327&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py?rev=18327&r1=18326&r2=18327&view=diff Modified: branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py?rev=18327&r1=18326&r2=18327&view=diff