Menu

Commit [r17839]  Maximize  Restore  History

Merged revisions 17661-17670 via svnmerge from

svn+ssh://bugman@.../svn/relax/trunk

........
r17661 | bugman | 2012-10-02 14:08:22 +0200 (Tue, 02 Oct 2012) | 5 lines

Fix for the test suite summary for Python 3.

The test suite now runs, but fails miserably, under Python 3.
........
r17662 | bugman | 2012-10-02 14:16:02 +0200 (Tue, 02 Oct 2012) | 3 lines

Python 3 fixes - the character '\' is now properly escaped as '\\' in the stereochemistry auto-analysis.
........
r17663 | bugman | 2012-10-02 14:18:41 +0200 (Tue, 02 Oct 2012) | 6 lines

Python 3 fix - the relax_errors.AllRelaxErrors object is now a proper tuple.

Due to bad coding, it was previously a nested tuple. This nested tuple worked in Python 2, but is
fatal for Python 3.
........
r17664 | bugman | 2012-10-02 14:23:43 +0200 (Tue, 02 Oct 2012) | 6 lines

Python 3 preparation - the relax data store (the data package) now supports both Python 2 and 3.

The command used was:
2to3 -w data/__init__.py
........
r17665 | bugman | 2012-10-02 14:25:52 +0200 (Tue, 02 Oct 2012) | 5 lines

Better support for both Python 2 and 3 in the relax data store.

The 2to3 script was used on all of the files in the data package.
........
r17666 | bugman | 2012-10-02 14:37:01 +0200 (Tue, 02 Oct 2012) | 7 lines

Python 3 bug fix for the state.load user function.

The header line of pickled states (rather than the standard XML states) is of the b'' byte format.
This is now converted to a string, and the search expression is comparing it to the raw string
r"<\?xml".
........
r17667 | bugman | 2012-10-02 15:18:32 +0200 (Tue, 02 Oct 2012) | 6 lines

Python 3 bug fix for the relax_io.read_spin_data() function.

The built in max() function cannot handle the value of None, therefore the filter() function is used
to remove all instances of None from the list.
........
r17668 | bugman | 2012-10-02 15:19:32 +0200 (Tue, 02 Oct 2012) | 3 lines

Python 3 fix for the results.read user function matching that of state.load at r17666.
........
r17669 | bugman | 2012-10-02 15:42:37 +0200 (Tue, 02 Oct 2012) | 6 lines

Python 3 fix for the reading of text from a bz2 file.

In Python 3, the readlines() function was returning a list of bytes types, not a list of strings.
The relax_io.extract_data() function now detects this and converts to string when possible.
........
r17670 | bugman | 2012-10-02 15:44:24 +0200 (Tue, 02 Oct 2012) | 5 lines

Python 3 bug fix for the N-state model target function setup.

The num_tensors variable needs to be an integer, but the Python 3 division will create a float type.
........

bugman 2012-10-16

changed /branches/frame_order_testing
changed /branches/frame_order_testing/auto_analyses/stereochem_analysis.py
changed /branches/frame_order_testing/data/__init__.py
changed /branches/frame_order_testing/data/align_tensor.py
changed /branches/frame_order_testing/data/data_classes.py
changed /branches/frame_order_testing/data/diff_tensor.py
changed /branches/frame_order_testing/data/relax_xml.py
changed /branches/frame_order_testing/generic_fns/results.py
changed /branches/frame_order_testing/generic_fns/state.py
changed /branches/frame_order_testing/maths_fns/n_state_model.py
changed /branches/frame_order_testing/relax_errors.py
changed /branches/frame_order_testing/relax_io.py
changed /branches/frame_order_testing/test_suite/test_suite_runner.py
/branches/frame_order_testing/auto_analyses/stereochem_analysis.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/data/__init__.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/data/align_tensor.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/data/data_classes.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/data/diff_tensor.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/data/relax_xml.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/generic_fns/results.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/generic_fns/state.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/maths_fns/n_state_model.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/relax_errors.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/relax_io.py Diff Switch to side-by-side view
Loading...
/branches/frame_order_testing/test_suite/test_suite_runner.py Diff Switch to side-by-side view
Loading...
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.