Author: bugman
Date: Tue Nov 25 20:14:44 2014
New Revision: 26724
URL: http://svn.gna.org/viewcvs/relax?rev=26724&view=rev
Log:
Merged revisions 26667,26670,26679,26681,26708,26710 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r26667 | bugman | 2014-11-20 15:58:14 +0100 (Thu, 20 Nov 2014) | 9 lines
Big Python 3 bug fix for the dep_check module for the detection of the
NMRPipe showApod software.
The showApod program was falsely detected as always not being present when
using Python 3. This is
because the output of the program was being tested using string
comparisons. However the output
from programs obtained from the subprocess module is no longer strings but
rather byte-arrays in
Python 3. Therefore the byte-array is not being converted to text if
Python 3 is being used,
allowing the showApod software to be detected.
........
r26670 | bugman | 2014-11-20 16:39:20 +0100 (Thu, 20 Nov 2014) | 6 lines
Python 3 bug fix for the lib.spectrum.nmrpipe.show_apod_extract() function.
The subprocess module output from the showApod program, or any software, is
a byte array in Python 3
rather than text. This is now detected and the byte array converted to
text before any processing.
........
r26679 | bugman | 2014-11-21 10:12:42 +0100 (Fri, 21 Nov 2014) | 3 lines
Fix for the unit tests to match r26656 - Python 2.5 floats do not have a
'real' property.
........
r26681 | bugman | 2014-11-21 10:29:34 +0100 (Fri, 21 Nov 2014) | 9 lines
Bug fix for the lib.structure.angles.angles_*() functions for odd
increments.
This affects the PDB representations of the diffusion tensor and frame
order when the number of
increments in the respective user functions is set to an odd number. It
really only affects the
frame_order.pdb_model user functions, as the number of increments cannot be
set in any of the other
user functions (structure.create_diff_tensor_pdb,
structure.create_rotor_pdb,
structure.create_vector_dist, n_state_model.cone_pdb).
........
r26708 | bugman | 2014-11-24 13:37:15 +0100 (Mon, 24 Nov 2014) | 6 lines
Backported the relax 3.3.3 CHANGES file changes to trunk.
The command used was:
svn merge -r26703:r26704 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/3.3.3 .
........
r26710 | bugman | 2014-11-25 10:27:00 +0100 (Tue, 25 Nov 2014) | 3 lines
Small updates for the wiki section of the release checklist document.
........
Modified:
branches/space_mapping_refactor/ (props changed)
branches/space_mapping_refactor/dep_check.py
branches/space_mapping_refactor/docs/CHANGES
branches/space_mapping_refactor/docs/devel/Release_Checklist
branches/space_mapping_refactor/lib/spectrum/nmrpipe.py
branches/space_mapping_refactor/lib/structure/angles.py
branches/space_mapping_refactor/test_suite/unit_tests/_data_store/test_align_tensor.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/space_mapping_refactor/dep_check.py
URL:
http://svn.gna.org/viewcvs/relax/branches/space_mapping_refactor/dep_check.py?rev=26724&r1=26723&r2=26724&view=diff
Modified: branches/space_mapping_refactor/docs/CHANGES
URL:
http://svn.gna.org/viewcvs/relax/branches/space_mapping_refactor/docs/CHANGES?rev=26724&r1=26723&r2=26724&view=diff
Modified: branches/space_mapping_refactor/docs/devel/Release_Checklist
URL:
http://svn.gna.org/viewcvs/relax/branches/space_mapping_refactor/docs/devel/Release_Checklist?rev=26724&r1=26723&r2=26724&view=diff
Modified: branches/space_mapping_refactor/lib/spectrum/nmrpipe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/space_mapping_refactor/lib/spectrum/nmrpipe.py?rev=26724&r1=26723&r2=26724&view=diff
Modified: branches/space_mapping_refactor/lib/structure/angles.py
URL:
http://svn.gna.org/viewcvs/relax/branches/space_mapping_refactor/lib/structure/angles.py?rev=26724&r1=26723&r2=26724&view=diff
Modified:
branches/space_mapping_refactor/test_suite/unit_tests/_data_store/test_align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/space_mapping_refactor/test_suite/unit_tests/_data_store/test_align_tensor.py?rev=26724&r1=26723&r2=26724&view=diff
r26724 - in /branches/space_mapping_refactor: ./ docs/ docs/devel/ lib/spectrum/ lib/structure/ test_suite/unit_tests/_data_...