Author: bugman
Date: Fri Feb 7 15:43:08 2014
New Revision: 22154
URL: http://svn.gna.org/viewcvs/relax?rev=22154&view=rev
Log:
Merged revisions 22148-22153 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22148 | bugman | 2014-02-07 11:46:28 +0100 (Fri, 07 Feb 2014) | 5 lines
Decreased the accuracy of the Relax_disp.test_korzhnev_2005_15n_dq_data
system test.
This is to allow the test to pass on a 32-bit test system (Mageia 4 i586
VM).
........
r22149 | bugman | 2014-02-07 13:27:25 +0100 (Fri, 07 Feb 2014) | 6 lines
Decreased the precision of the
Relax_disp.test_hansen_cpmg_data_auto_analysis system test.
This is to allow the test to pass on a 32-bit test system using Python 2.5
and Python 3.1 (Mageia 4
i586 VM).
........
r22150 | bugman | 2014-02-07 13:34:00 +0100 (Fri, 07 Feb 2014) | 6 lines
Decreased the precision of the
Relax_disp.test_hansen_cpmg_data_auto_analysis_r2eff system test.
This is to allow the test to pass on a 32-bit test system using Python 2.5
and Python 3.1 (Mageia 4
i586 VM).
........
r22151 | bugman | 2014-02-07 13:36:28 +0100 (Fri, 07 Feb 2014) | 6 lines
Decreased the precision of the Relax_disp.test_hansen_cpmg_data_to_cr72
system test.
This is to allow the test to pass on a 32-bit test system using Python 2.5
and Python 3.1 (Mageia 4
i586 VM).
........
r22152 | bugman | 2014-02-07 13:42:38 +0100 (Fri, 07 Feb 2014) | 7 lines
Fix for the
test_suite/system_tests/scripts/noe/bug_21562_noe_replicate_fail.py system
test script.
There was some invisible binary junk at the start of the file which as
causing the
Noe.test_bug_21562_noe_replicate_fail system test to fail, as the script
could not load. This was
only affecting one 32-bit test system using Python 3.1 and Python 3.2
(Mageia 4 i586 VM).
........
r22153 | bugman | 2014-02-07 13:47:47 +0100 (Fri, 07 Feb 2014) | 6 lines
Fixes for the unit tests of the package __all__ lists for Python 3.
When Python 3 generates byte-compiled *.pyc files, these are stored in
__pycache__ directories.
These directories are now skipped for the package content unit tests,
allowing the test to pass.
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/test_suite/system_tests/relax_disp.py
branches/double_rotor/test_suite/system_tests/scripts/noe/bug_21562_noe_replicate_fail.py
branches/double_rotor/test_suite/unit_tests/package_checking.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 7 15:43:08 2014
@@ -1,1 +1,1 @@
-/trunk:1-22112,22115-22118,22125-22144
+/trunk:1-22153
Modified: branches/double_rotor/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/relax_disp.py?rev=22154&r1=22153&r2=22154&view=diff
==============================================================================
--- branches/double_rotor/test_suite/system_tests/relax_disp.py (original)
+++ branches/double_rotor/test_suite/system_tests/relax_disp.py Fri Feb 7
15:43:08 2014
@@ -556,7 +556,7 @@
print("%-20s %20.15g %20.15g" % ("kex", spin70.kex, spin71.kex))
print("%-20s %20.15g %20.15g\n" % ("chi2", spin70.chi2, spin71.chi2))
self.assertAlmostEqual(spin70.r2[r20_key1], 6.74326615264889, 3)
- self.assertAlmostEqual(spin70.r2[r20_key2], 6.57331164382438, 3)
+ self.assertAlmostEqual(spin70.r2[r20_key2], 6.57331164382438, 2)
self.assertAlmostEqual(spin70.phi_ex, 0.312767653822936, 3)
self.assertAlmostEqual(spin70.kex/10000, 4723.44390412119/10000, 3)
self.assertAlmostEqual(spin70.chi2, 363.534049046805, 3)
@@ -737,7 +737,7 @@
print("%-20s %20.15g %20.15g" % ("kex", spin70.kex, spin71.kex))
print("%-20s %20.15g %20.15g\n" % ("chi2", spin70.chi2, spin71.chi2))
self.assertAlmostEqual(spin70.r2[r20_key1], 6.74326615264889, 3)
- self.assertAlmostEqual(spin70.r2[r20_key2], 6.57331164382438, 3)
+ self.assertAlmostEqual(spin70.r2[r20_key2], 6.57331164382438, 2)
self.assertAlmostEqual(spin70.phi_ex, 0.312767653822936, 3)
self.assertAlmostEqual(spin70.kex/10000, 4723.44390412119/10000, 3)
self.assertAlmostEqual(spin70.chi2, 363.534049046805, 3)
@@ -888,10 +888,10 @@
# Checks for residue :70.
self.assertAlmostEqual(spin70.r2[r20_key1], 6.97260604007474, 4)
- self.assertAlmostEqual(spin70.r2[r20_key2], 9.41009302654463, 4)
+ self.assertAlmostEqual(spin70.r2[r20_key2], 9.41009302654463, 2)
self.assertAlmostEqual(spin70.pA, 0.989856764756131, 4)
- self.assertAlmostEqual(spin70.dw, 5.60887354423638, 4)
- self.assertAlmostEqual(spin70.kex/1000, 1752.75852303464/1000, 4)
+ self.assertAlmostEqual(spin70.dw, 5.60887354423638, 3)
+ self.assertAlmostEqual(spin70.kex/1000, 1752.75852303464/1000, 3)
self.assertAlmostEqual(spin70.chi2, 53.8382124791236, 4)
# Checks for residue :71.
@@ -1599,11 +1599,11 @@
# Checks for residue :9.
self.assertAlmostEqual(spin.r2[r20_key1], 9.48527908326952, 2)
- self.assertAlmostEqual(spin.r2[r20_key2], 11.7135951595536, 3)
+ self.assertAlmostEqual(spin.r2[r20_key2], 11.7135951595536, 2)
self.assertAlmostEqual(spin.r2[r20_key3], 13.6153887849344, 2)
self.assertAlmostEqual(spin.pA, 0.965638501551899, 4)
- self.assertAlmostEqual(spin.dw, 2.8537583461577, 2)
- self.assertAlmostEqual(spin.dwH, -0.387633062766635, 3)
+ self.assertAlmostEqual(spin.dw, 2.8537583461577, 1)
+ self.assertAlmostEqual(spin.dwH, -0.387633062766635, 2)
self.assertAlmostEqual(spin.kex/1000, 573.704033851592/1000, 3)
self.assertAlmostEqual(spin.chi2, 9.29563496654824, 2)
Modified:
branches/double_rotor/test_suite/system_tests/scripts/noe/bug_21562_noe_replicate_fail.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/scripts/noe/bug_21562_noe_replicate_fail.py?rev=22154&r1=22153&r2=22154&view=diff
==============================================================================
---
branches/double_rotor/test_suite/system_tests/scripts/noe/bug_21562_noe_replicate_fail.py
(original)
+++
branches/double_rotor/test_suite/system_tests/scripts/noe/bug_21562_noe_replicate_fail.py
Fri Feb 7 15:43:08 2014
@@ -1,4 +1,4 @@
-"""Script for demonstrating bug #21562, the failure of the NOE analysis
when replicated spectra are used."""
+"""Script for demonstrating bug #21562, the failure of the NOE analysis when
replicated spectra are used."""
# Python module imports.
from os import sep
Modified: branches/double_rotor/test_suite/unit_tests/package_checking.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/unit_tests/package_checking.py?rev=22154&r1=22153&r2=22154&view=diff
==============================================================================
--- branches/double_rotor/test_suite/unit_tests/package_checking.py (original)
+++ branches/double_rotor/test_suite/unit_tests/package_checking.py Fri Feb
7 15:43:08 2014
@@ -54,6 +54,10 @@
if search("^\.", file):
continue
+ # Skip the Python 3 '__pycache__' directories.
+ if file == '__pycache__':
+ continue
+
# Only check Python files and directories.
if not search("\.py$", file) and not isdir(path):
continue
r22154 - in /branches/double_rotor: ./ test_suite/system_tests/ test_suite/system_tests/scripts/noe/ test_suite/unit_tests/