Author: bugman
Date: Wed Mar 26 17:28:13 2014
New Revision: 22534
URL: http://svn.gna.org/viewcvs/relax?rev=22534&view=rev
Log:
Merged revisions 22530-22533 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22530 | bugman | 2014-03-26 15:57:21 +0100 (Wed, 26 Mar 2014) | 9 lines
Improvements for the log converter script.
This is for the scripted used to convert SVN messages into a format for the
relax release
announcement.
The script now handles spacing better. Multi-line messages are now
concatenated into a single line
using a double space between separate sentences and a single space in all
other cases.
........
r22531 | bugman | 2014-03-26 16:14:18 +0100 (Wed, 26 Mar 2014) | 7 lines
Improvements for the pipe_control.mol_res_spin.generate_spin_id_unique()
function.
The unique spin ID now takes into account if the molecule is named or not
(for single molecules).
This allows the function to be used when dealing with the structural data
rather than the molecule,
residue, and spin data structure.
........
r22532 | bugman | 2014-03-26 16:20:58 +0100 (Wed, 26 Mar 2014) | 3 lines
Copyright update.
........
r22533 | bugman | 2014-03-26 16:22:18 +0100 (Wed, 26 Mar 2014) | 6 lines
Removed the full stop from the printout of the test names in the test suite.
This allows for quicker copying and pasting of the test name when running
with the --time option and
then selecting a single test to run.
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/devel_scripts/log_converter.py
branches/double_rotor/pipe_control/mol_res_spin.py
branches/double_rotor/test_suite/relax_test_runner.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 26 17:28:13 2014
@@ -1 +1 @@
-/trunk:1-22520
+/trunk:1-22533
Modified: branches/double_rotor/devel_scripts/log_converter.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/devel_scripts/log_converter.py?rev=22534&r1=22533&r2=22534&view=diff
==============================================================================
--- branches/double_rotor/devel_scripts/log_converter.py (original)
+++ branches/double_rotor/devel_scripts/log_converter.py Wed Mar 26
17:28:13 2014
@@ -58,10 +58,10 @@
# Whitespace.
if len(msg):
- if search('[a-zA-Z]$', msg[-1]):
+ if search('\.$', msg[-1]):
+ msg += ' '
+ else:
msg += ' '
- elif search('\.$', msg[-1]):
- msg += ' '
# Add the line (without the newline char).
msg += line[:-1]
Modified: branches/double_rotor/pipe_control/mol_res_spin.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/mol_res_spin.py?rev=22534&r1=22533&r2=22534&view=diff
==============================================================================
--- branches/double_rotor/pipe_control/mol_res_spin.py (original)
+++ branches/double_rotor/pipe_control/mol_res_spin.py Wed Mar 26 17:28:13
2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2003-2013 Edward d'Auvergne
#
+# Copyright (C) 2003-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -1423,6 +1423,8 @@
# Get the containers if needed.
if mol == None:
mol = return_molecule_by_name(pipe_cont=pipe_cont, mol_name=mol_name)
+ if mol == None and len(pipe_cont.mol) == 1 and pipe_cont.mol[0].name
== None:
+ mol_name = None
if mol != None and res == None:
if res_name != None or res_num != None:
res = return_residue_by_info(mol=mol, res_name=res_name,
res_num=res_num)
Modified: branches/double_rotor/test_suite/relax_test_runner.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/relax_test_runner.py?rev=22534&r1=22533&r2=22534&view=diff
==============================================================================
--- branches/double_rotor/test_suite/relax_test_runner.py (original)
+++ branches/double_rotor/test_suite/relax_test_runner.py Wed Mar 26
17:28:13 2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2008-2013 Edward d'Auvergne
#
+# Copyright (C) 2008-2014 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -168,7 +168,7 @@
test_name = "%s.%s" % (test_name[-2], test_name[-1])
# The printout.
- self.stream.write(' %7.2f s for %s.\n' % (-self.time, test_name))
+ self.stream.write(' %7.2f s for %s\n' % (-self.time, test_name))
r22534 - in /branches/double_rotor: ./ devel_scripts/ pipe_control/ test_suite/