Author: tlinnet Date: Tue May 20 22:42:12 2014 New Revision: 23279 URL: http://svn.gna.org/viewcvs/relax?rev=23279&view=rev Log: Merged revisions 23262-23264,23267 via svnmerge from svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk ........ r23262 | bugman | 2014-05-20 17:50:10 +0200 (Tue, 20 May 2014) | 5 lines Python 3 fixes for the extern.numpy_future module. These changes are necessary to allow relax to even run. ........ r23263 | bugman | 2014-05-20 18:02:55 +0200 (Tue, 20 May 2014) | 20 lines Python 3 fixes for all of the relax code base. The command used was: 2to3 -j 4 -w \ -f buffer \ -f idioms \ -f set_literal \ -f ws_comma \ -x except \ -x import \ -x imports \ -x long \ -x numliterals \ -x xrange \ . The lib.compat and multi.processor module changes were fatal, not useful for Python 3, and hence reverted. ........ r23264 | bugman | 2014-05-20 19:06:02 +0200 (Tue, 20 May 2014) | 8 lines Python >= 3.2 fix for the Relax_disp.test_sod1wt_t25_to_sherekhan_input system test. The B0 field value of the ShereKhan input files created by the relax_disp.sherekhan_input user function was formatted as "%s". However in Python >= 3.2, floats are now converted to have 14 decimal places whereas previous Python versions only had 10 places. The user function backend now forces only 10 decimal places to be written to the input files. ........ r23267 | bugman | 2014-05-20 19:21:49 +0200 (Tue, 20 May 2014) | 5 lines Update for the release checklist. The log_converter.py script instructions should now work on more systems. ........ Modified: branches/disp_speed/ (props changed) branches/disp_speed/docs/Release_Checklist branches/disp_speed/extern/numpy_future.py branches/disp_speed/pipe_control/opendx.py branches/disp_speed/specific_analyses/relax_disp/sherekhan.py branches/disp_speed/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin.py branches/disp_speed/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin_15N.py branches/disp_speed/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin_r2a_eq_r2b.py branches/disp_speed/test_suite/system_tests/relax_disp.py branches/disp_speed/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py branches/disp_speed/test_suite/unit_tests/_specific_analyses/_relax_disp/test_data.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/disp_speed/docs/Release_Checklist URL: http://svn.gna.org/viewcvs/relax/branches/disp_speed/docs/Release_Checklist?rev=23279&r1=23278&r2=23279&view=diff Modified: branches/disp_speed/extern/numpy_future.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_speed/extern/numpy_future.py?rev=23279&r1=23278&r2=23279&view=diff Modified: branches/disp_speed/pipe_control/opendx.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_speed/pipe_control/opendx.py?rev=23279&r1=23278&r2=23279&view=diff Modified: branches/disp_speed/specific_analyses/relax_disp/sherekhan.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_speed/specific_analyses/relax_disp/sherekhan.py?rev=23279&r1=23278&r2=23279&view=diff Modified: branches/disp_speed/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin.py?rev=23279&r1=23278&r2=23279&view=diff Modified: branches/disp_speed/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin_15N.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin_15N.py?rev=23279&r1=23278&r2=23279&view=diff Modified: branches/disp_speed/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin_r2a_eq_r2b.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/shared_data/dispersion/Baldwin_2014/Baldwin_r2a_eq_r2b.py?rev=23279&r1=23278&r2=23279&view=diff Modified: branches/disp_speed/test_suite/system_tests/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/system_tests/relax_disp.py?rev=23279&r1=23278&r2=23279&view=diff Modified: branches/disp_speed/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py?rev=23279&r1=23278&r2=23279&view=diff Modified: branches/disp_speed/test_suite/unit_tests/_specific_analyses/_relax_disp/test_data.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_speed/test_suite/unit_tests/_specific_analyses/_relax_disp/test_data.py?rev=23279&r1=23278&r2=23279&view=diff