Author: bugman
Date: Wed Jul 17 14:02:56 2013
New Revision: 20352
URL: http://svn.gna.org/viewcvs/relax?rev=20352&view=rev
Log:
Merged revisions 20337,20341,20350-20351 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r20337 | bugman | 2013-07-16 17:15:04 +0200 (Tue, 16 Jul 2013) | 3 lines
Spacing fix in an import statement (found using the 2to3 conversion
program).
........
r20341 | bugman | 2013-07-16 17:44:42 +0200 (Tue, 16 Jul 2013) | 5 lines
Added the relax wiki backup script for dumping the MySQL database contents
locally.
This is from http://article.gmane.org/gmane.science.nmr.relax.devel/4163.
........
r20350 | bugman | 2013-07-17 13:58:11 +0200 (Wed, 17 Jul 2013) | 5 lines
Added the script from Troels Linnet for backing up the relax wiki via FTP.
This is from the post
http://article.gmane.org/gmane.science.nmr.relax.devel/4168.
........
r20351 | bugman | 2013-07-17 13:59:49 +0200 (Wed, 17 Jul 2013) | 5 lines
Added a link to Troels' post to the relax-devel mailing list to the relax
wiki FTP backup script.
The link is http://article.gmane.org/gmane.science.nmr.relax.devel/4168
........
Added:
branches/relax_disp/devel_scripts/wiki_ftpdump.sh
- copied unchanged from r20351, trunk/devel_scripts/wiki_ftpdump.sh
branches/relax_disp/devel_scripts/wiki_mysqldump.sh
- copied unchanged from r20351, trunk/devel_scripts/wiki_mysqldump.sh
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/test_suite/unit_tests/_lib/_geometry/test_rotations.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 17 14:02:56 2013
@@ -1,1 +1,1 @@
-/trunk:1-20291
+/trunk:1-20351
Modified:
branches/relax_disp/test_suite/unit_tests/_lib/_geometry/test_rotations.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/unit_tests/_lib/_geometry/test_rotations.py?rev=20352&r1=20351&r2=20352&view=diff
==============================================================================
---
branches/relax_disp/test_suite/unit_tests/_lib/_geometry/test_rotations.py
(original)
+++
branches/relax_disp/test_suite/unit_tests/_lib/_geometry/test_rotations.py
Wed Jul 17 14:02:56 2013
@@ -29,7 +29,7 @@
# relax module imports.
from pipe_control.angles import wrap_angles
-from lib.geometry.rotations import axis_angle_to_euler_xyx,
axis_angle_to_euler_xyz, axis_angle_to_euler_xzx, axis_angle_to_euler_xzy,
axis_angle_to_euler_yxy, axis_angle_to_euler_yxz, axis_angle_to_euler_yzx,
axis_angle_to_euler_yzy, axis_angle_to_euler_zxy, axis_angle_to_euler_zxz,
axis_angle_to_euler_zyx, axis_angle_to_euler_zyz, axis_angle_to_R,
axis_angle_to_quaternion, euler_to_axis_angle_xyx, euler_to_axis_angle_xyz,
euler_to_axis_angle_xzx, euler_to_axis_angle_xzy, euler_to_axis_angle_yxy,
euler_to_axis_angle_yxz, euler_to_axis_angle_yzx, euler_to_axis_angle_yzy,
euler_to_axis_angle_zxy, euler_to_axis_angle_zxz, euler_to_axis_angle_zyx,
euler_to_axis_angle_zyz,euler_to_R_xyx, euler_to_R_xyz, euler_to_R_xzx,
euler_to_R_xzy, euler_to_R_yxy, euler_to_R_yxz, euler_to_R_yzx,
euler_to_R_yzy, euler_to_R_zxy, euler_to_R_zxz, euler_to_R_zyx,
euler_to_R_zyz, R_random_hypersphere, R_to_axis_angle, R_to_euler_xyx,
R_to_euler_xyz, R_to_euler_xzx, R_to_euler_xzy, R_to_euler_yxy,
R_to_euler_yxz, R_to_euler_yzx, R_to_euler_yzy, R_to_euler_zxy,
R_to_euler_zxz, R_to_euler_zyx, R_to_euler_zyz, R_to_quaternion,
reverse_euler_zyz, quaternion_to_axis_angle, quaternion_to_R
+from lib.geometry.rotations import axis_angle_to_euler_xyx,
axis_angle_to_euler_xyz, axis_angle_to_euler_xzx, axis_angle_to_euler_xzy,
axis_angle_to_euler_yxy, axis_angle_to_euler_yxz, axis_angle_to_euler_yzx,
axis_angle_to_euler_yzy, axis_angle_to_euler_zxy, axis_angle_to_euler_zxz,
axis_angle_to_euler_zyx, axis_angle_to_euler_zyz, axis_angle_to_R,
axis_angle_to_quaternion, euler_to_axis_angle_xyx, euler_to_axis_angle_xyz,
euler_to_axis_angle_xzx, euler_to_axis_angle_xzy, euler_to_axis_angle_yxy,
euler_to_axis_angle_yxz, euler_to_axis_angle_yzx, euler_to_axis_angle_yzy,
euler_to_axis_angle_zxy, euler_to_axis_angle_zxz, euler_to_axis_angle_zyx,
euler_to_axis_angle_zyz, euler_to_R_xyx, euler_to_R_xyz, euler_to_R_xzx,
euler_to_R_xzy, euler_to_R_yxy, euler_to_R_yxz, euler_to_R_yzx,
euler_to_R_yzy, euler_to_R_zxy, euler_to_R_zxz, euler_to_R_zyx,
euler_to_R_zyz, R_random_hypersphere, R_to_axis_angle, R_to_euler_xyx,
R_to_euler_xyz, R_to_euler_xzx, R_to_euler_xzy, R_to_euler_yxy,
R_to_euler_yxz, R_to_euler_yzx, R_to_euler_yzy, R_to_euler_zxy,
R_to_euler_zxz, R_to_euler_zyx, R_to_euler_zyz, R_to_quaternion,
reverse_euler_zyz, quaternion_to_axis_angle, quaternion_to_R
# Global variables (reusable storage).
r20352 - in /branches/relax_disp: ./ devel_scripts/ test_suite/unit_tests/_lib/_geometry/