Author: semor
Date: Tue Jan 8 16:57:37 2008
New Revision: 4496
URL: http://svn.gna.org/viewcvs/relax?rev=4496&view=rev
Log:
Merged revisions 4476,4481-4493 via svnmerge from
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.3
........
r4476 | bugman | 2008-01-08 03:50:10 -0500 (Tue, 08 Jan 2008) | 3 lines
Ordered the committers list alphabetically.
........
r4481 | bugman | 2008-01-08 08:29:05 -0500 (Tue, 08 Jan 2008) | 3 lines
Shifted the contents of the test_opendx_s2_te_rex() system test into its
own script.
........
r4482 | bugman | 2008-01-08 08:31:18 -0500 (Tue, 08 Jan 2008) | 5 lines
Bug fix: Removed the 'quit' keyword arg from the call of the prompt()
function.
The relax prompt is back again!
........
r4483 | bugman | 2008-01-08 08:47:15 -0500 (Tue, 08 Jan 2008) | 3 lines
Converted all of the opt_setup_S2_0_970_te_2048_Rex_0_149() set up function
into its own script.
........
r4484 | bugman | 2008-01-08 08:51:52 -0500 (Tue, 08 Jan 2008) | 3 lines
All the model-free optimisation tests now run the
opt_setup_S2_0_970_te_2048_Rex_0_149.py script.
........
r4485 | bugman | 2008-01-08 09:18:10 -0500 (Tue, 08 Jan 2008) | 5 lines
Tidied up the interact_script() function (with comments). The function
also returns its status.
The status is obviously only returned if relax doesn't not quit.
........
r4486 | bugman | 2008-01-08 09:26:28 -0500 (Tue, 08 Jan 2008) | 5 lines
The status of script execution is now returned by the run() interpreter
method.
Nothing currently uses this.
........
r4487 | bugman | 2008-01-08 09:36:16 -0500 (Tue, 08 Jan 2008) | 8 lines
prompt.interpreter.interact_script() has been modified to allow RelaxErrors
to be raised.
Previously running a script would catch the error, send a nice message to
STDERR, and quit. Now
the function can raise the error if asked. This is required for the system
tests (because of the
unittest framework). Alternatively the status of the script could have
been used by the test, but
this is easier for the test writer and makes the code more flexible.
........
r4488 | bugman | 2008-01-08 09:42:44 -0500 (Tue, 08 Jan 2008) | 3 lines
Converted the interact_prompt() args to keyword args and epydoc'd the
docstring.
........
r4489 | bugman | 2008-01-08 10:19:57 -0500 (Tue, 08 Jan 2008) | 3 lines
Updated the interact_script() docstring for the epydoc format.
........
r4490 | bugman | 2008-01-08 10:21:23 -0500 (Tue, 08 Jan 2008) | 3 lines
Updated the prompt() docstring for the epydoc format.
........
r4491 | bugman | 2008-01-08 10:22:33 -0500 (Tue, 08 Jan 2008) | 3 lines
Updated the run_script() docstring for the epydoc format.
........
r4492 | bugman | 2008-01-08 10:22:58 -0500 (Tue, 08 Jan 2008) | 3 lines
Converted the default quit arg of run_script() to a bool.
........
r4493 | bugman | 2008-01-08 10:24:17 -0500 (Tue, 08 Jan 2008) | 3 lines
Updated the runcode() docstring for the epydoc format.
........
Added:
branches/consistency_tests_1.3/test_suite/system_tests/scripts/opendx_s2_te_rex.py
- copied unchanged from r4493,
1.3/test_suite/system_tests/scripts/opendx_s2_te_rex.py
branches/consistency_tests_1.3/test_suite/system_tests/scripts/opt_setup_S2_0_970_te_2048_Rex_0_149.py
- copied unchanged from r4493,
1.3/test_suite/system_tests/scripts/opt_setup_S2_0_970_te_2048_Rex_0_149.py
Modified:
branches/consistency_tests_1.3/ (props changed)
branches/consistency_tests_1.3/docs/COMMITTERS
branches/consistency_tests_1.3/prompt/interpreter.py
branches/consistency_tests_1.3/relax
branches/consistency_tests_1.3/test_suite/system_tests/model_free.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/consistency_tests_1.3/docs/COMMITTERS
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/docs/COMMITTERS?rev=4496&r1=4495&r2=4496&view=diff
Modified: branches/consistency_tests_1.3/prompt/interpreter.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/interpreter.py?rev=4496&r1=4495&r2=4496&view=diff
Modified: branches/consistency_tests_1.3/relax
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/relax?rev=4496&r1=4495&r2=4496&view=diff
Modified: branches/consistency_tests_1.3/test_suite/system_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/test_suite/system_tests/model_free.py?rev=4496&r1=4495&r2=4496&view=diff
r4496 - in /branches/consistency_tests_1.3: ./ docs/ prompt/ test_suite/system_tests/ test_suite/system_tests/scripts/