Author: bugman
Date: Thu Aug 8 12:04:44 2013
New Revision: 20570
URL: http://svn.gna.org/viewcvs/relax?rev=20570&view=rev
Log:
Merged revisions 20536,20542,20544,20547-20550,20553,20555,20565-20566 via
svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r20536 | bugman | 2013-08-06 09:02:50 +0200 (Tue, 06 Aug 2013) | 4 lines
Python 3 fix for the lib.software.nmrpipe.read_list_intensity_seriestab()
function.
The inbuilt Python filter() function does not return a list in Python 3, as
previously, but rather
a filter object. Therefore a call to list() is required to properly
convert the data.
........
r20542 | bugman | 2013-08-06 10:23:46 +0200 (Tue, 06 Aug 2013) | 9 lines
An attempt at better handling MS Windows not releasing the file handle on
time in the test suite.
The system and unit tests tearDown() method should now be resilient to the
strange MS Windows
behaviour of not releasing the relax state files. The tearDown() method
should now complete even
when this error occurs. A delay of 3 seconds has been added when the
WindowsError occurs to give
the OS some time before attempting to delete the file again. If this
fails, then the file deletion
operation is skipped.
........
r20544 | bugman | 2013-08-06 10:31:54 +0200 (Tue, 06 Aug 2013) | 3 lines
Updated the minimum Python version from 2.3 to 2.5 in the user manual.
........
r20547 | bugman | 2013-08-06 11:38:56 +0200 (Tue, 06 Aug 2013) | 8 lines
Better handling of temporary file and directory removal in the relax test
suite.
The new test_suite.clean_up.deletion() function has been created from the
recent method of the same
name. This is used by the tearDown() method of the system, unit, and GUI
tests. It should prevent
rare MS Windows errors from appearing due to the OS not releasing a
temporary file after a close()
call.
........
r20548 | bugman | 2013-08-06 13:55:40 +0200 (Tue, 06 Aug 2013) | 6 lines
Epydoc docstring fix for the pipe_control.spectrum.read() function.
The text "Z_A{i}" causes problems when compiling the API documentation, so
it has been changed to
"Z_Ai".
........
r20549 | bugman | 2013-08-06 14:21:31 +0200 (Tue, 06 Aug 2013) | 6 lines
Python 3 fix for the new test_suite.clean_up module.
The exceptions Python module does not exist in Python 3, so instead the
relax compat.builtins object
is being used to store the WindowsError variable of None.
........
r20550 | bugman | 2013-08-06 14:48:46 +0200 (Tue, 06 Aug 2013) | 3 lines
Added a paragraph to the installation chapter of the manual about not
supporting the EPD.
........
r20553 | bugman | 2013-08-06 18:33:32 +0200 (Tue, 06 Aug 2013) | 3 lines
Removal of trailing whitespace in the docs/CHANGES document.
........
r20555 | bugman | 2013-08-06 18:35:14 +0200 (Tue, 06 Aug 2013) | 6 lines
Backported the relax 3.0.0 changes file additions to trunk.
The command used was:
svn merge -r20553:20554 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/3.0.0 .
........
r20565 | bugman | 2013-08-07 17:22:44 +0200 (Wed, 07 Aug 2013) | 3 lines
Bibtex fixes required for proper latex2html compilation.
........
r20566 | bugman | 2013-08-07 17:23:47 +0200 (Wed, 07 Aug 2013) | 3 lines
The font size is no longer set for the latex2html compiled user manual.
........
Added:
branches/relax_disp/test_suite/clean_up.py
- copied unchanged from r20566, trunk/test_suite/clean_up.py
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/docs/CHANGES
branches/relax_disp/docs/latex/.latex2html-init
branches/relax_disp/docs/latex/bibliography.bib
branches/relax_disp/docs/latex/install.tex
branches/relax_disp/lib/software/nmrpipe.py
branches/relax_disp/pipe_control/spectrum.py
branches/relax_disp/test_suite/gui_tests/base_classes.py
branches/relax_disp/test_suite/system_tests/base_classes.py
branches/relax_disp/test_suite/unit_tests/base_classes.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/relax_disp/docs/CHANGES
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/CHANGES?rev=20570&r1=20569&r2=20570&view=diff
Modified: branches/relax_disp/docs/latex/.latex2html-init
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/.latex2html-init?rev=20570&r1=20569&r2=20570&view=diff
Modified: branches/relax_disp/docs/latex/bibliography.bib
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/bibliography.bib?rev=20570&r1=20569&r2=20570&view=diff
Modified: branches/relax_disp/docs/latex/install.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/install.tex?rev=20570&r1=20569&r2=20570&view=diff
Modified: branches/relax_disp/lib/software/nmrpipe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/software/nmrpipe.py?rev=20570&r1=20569&r2=20570&view=diff
Modified: branches/relax_disp/pipe_control/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/spectrum.py?rev=20570&r1=20569&r2=20570&view=diff
Modified: branches/relax_disp/test_suite/gui_tests/base_classes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/base_classes.py?rev=20570&r1=20569&r2=20570&view=diff
Modified: branches/relax_disp/test_suite/system_tests/base_classes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/base_classes.py?rev=20570&r1=20569&r2=20570&view=diff
Modified: branches/relax_disp/test_suite/unit_tests/base_classes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/unit_tests/base_classes.py?rev=20570&r1=20569&r2=20570&view=diff
r20570 - in /branches/relax_disp: ./ docs/ docs/latex/ lib/software/ pipe_control/ test_suite/ test_suite/gui_tests/ test_su...