Author: bugman
Date: Wed Jul 23 18:11:44 2014
New Revision: 24686
URL: http://svn.gna.org/viewcvs/relax?rev=24686&view=rev
Log:
Merged revisions 24679,24684-24685 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r24679 | bugman | 2014-07-23 16:09:01 +0200 (Wed, 23 Jul 2014) | 6 lines
Updated the minfx version number to 1.0.9 in the release checklist document.
This as of yet unreleased version contains an important fix for
parallelised grid searches when the
number of increments is set to one (i.e. a preset parameter).
........
r24684 | bugman | 2014-07-23 17:40:34 +0200 (Wed, 23 Jul 2014) | 5 lines
Bug fix for the lib.arg_check.is_num_tuple() function.
There was a typo in two of the RelaxError objects so that non-existent
errors were being raised.
........
r24685 | bugman | 2014-07-23 18:09:27 +0200 (Wed, 23 Jul 2014) | 6 lines
Fix for the
_prompt.test_align_tensor.Test_align_tensor.test_init_argfail_params unit
test.
As the alignment tensor can now be initialised as None, the None value can
be accepted and a
different RelaxError is raised when the params argument is incorrectly
supplied.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/docs/Release_Checklist
branches/frame_order_cleanup/lib/arg_check.py
branches/frame_order_cleanup/test_suite/unit_tests/_prompt/test_align_tensor.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 23 18:11:44 2014
@@ -1 +1 @@
-/trunk:1-24669
+/trunk:1-24685
Modified: branches/frame_order_cleanup/docs/Release_Checklist
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/Release_Checklist?rev=24686&r1=24685&r2=24686&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/Release_Checklist (original)
+++ branches/frame_order_cleanup/docs/Release_Checklist Wed Jul 23 18:11:44
2014
@@ -70,7 +70,7 @@
Bundle minfx and bmrblib by checking out the latest stable release tags, for
example:
-$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/tags/1.0.8/minfx
+$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/tags/1.0.9/minfx
$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/bmrblib/tags/1.0.3/bmrblib
@@ -107,7 +107,7 @@
$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/2.0.1
$ cd 2.0.1
-$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/tags/1.0.8/minfx
+$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/tags/1.0.9/minfx
$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/bmrblib/tags/1.0.3/bmrblib
$ scons binary_dist key=xxxxx
@@ -115,7 +115,7 @@
$ svn co http://svn.gna.org/svn/relax/tags/2.0.1
$ cd 2.0.1
-$ svn co http://svn.gna.org/svn/minfx/tags/1.0.8/minfx
+$ svn co http://svn.gna.org/svn/minfx/tags/1.0.9/minfx
$ svn co http://svn.gna.org/svn/bmrblib/tags/1.0.3/bmrblib
$ scons binary_dist
Modified: branches/frame_order_cleanup/lib/arg_check.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/arg_check.py?rev=24686&r1=24685&r2=24686&view=diff
==============================================================================
--- branches/frame_order_cleanup/lib/arg_check.py (original)
+++ branches/frame_order_cleanup/lib/arg_check.py Wed Jul 23 18:11:44
2014
@@ -860,9 +860,9 @@
if not raise_error:
return False
if can_be_none and size != None:
- raise RelaxNoneTupleNumError(name, arg, size)
- elif can_be_none:
- raise RelaxNoneTupleNumError(name, arg)
+ raise RelaxNoneNumTupleNumError(name, arg, size)
+ elif can_be_none:
+ raise RelaxNoneNumTupleNumError(name, arg)
elif size != None:
raise RelaxTupleNumError(name, arg, size)
else:
Modified:
branches/frame_order_cleanup/test_suite/unit_tests/_prompt/test_align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/unit_tests/_prompt/test_align_tensor.py?rev=24686&r1=24685&r2=24686&view=diff
==============================================================================
---
branches/frame_order_cleanup/test_suite/unit_tests/_prompt/test_align_tensor.py
(original)
+++
branches/frame_order_cleanup/test_suite/unit_tests/_prompt/test_align_tensor.py
Wed Jul 23 18:11:44 2014
@@ -22,7 +22,7 @@
# relax module imports.
from pipe_control import align_tensor
from prompt.interpreter import Interpreter
-from lib.errors import RelaxError, RelaxBoolError, RelaxFloatError,
RelaxIntError, RelaxNoneListStrError, RelaxNoneStrError, RelaxTupleNumError,
RelaxStrError
+from lib.errors import RelaxError, RelaxBoolError, RelaxFloatError,
RelaxIntError, RelaxNoneListStrError, RelaxNoneStrError,
RelaxNoneNumTupleNumError, RelaxStrError
from test_suite.unit_tests.align_tensor_testing_base import
Align_tensor_base_class
# Unit test imports.
@@ -177,13 +177,13 @@
# Loop over the data types.
for data in DATA_TYPES:
# Catch the tuple arguments.
- if data[0] == 'tuple' or data[0] == 'float tuple' or data[0] ==
'str tuple':
+ if data[0] == 'None' or data[0] == 'tuple' or data[0] == 'float
tuple' or data[0] == 'str tuple':
# Correct tuple length.
- if len(data[1]) == 5:
+ if data[0] == 'None' or len(data[1]) == 5:
continue
# The argument test.
- self.assertRaises(RelaxTupleNumError,
self.align_tensor_fns.init, align_id='Pf1', params=data[1])
+ self.assertRaises(RelaxNoneNumTupleNumError,
self.align_tensor_fns.init, align_id='Pf1', params=data[1])
def test_init_argfail_scale(self):
r24686 - in /branches/frame_order_cleanup: ./ docs/ lib/ test_suite/unit_tests/_prompt/