Author: bugman
Date: Tue Sep 2 11:19:53 2014
New Revision: 25534
URL: http://svn.gna.org/viewcvs/relax?rev=25534&view=rev
Log:
Merged revisions 25508,25528 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r25508 | bugman | 2014-09-01 17:38:49 +0200 (Mon, 01 Sep 2014) | 6 lines
Updated the minfx version numbers in the release checklist document.
The version is now 1.0.10, which has not been released yet but will contain
the implementation of
the log-barrier constraint algorithm gradient and Hessian.
........
r25528 | bugman | 2014-09-02 09:34:16 +0200 (Tue, 02 Sep 2014) | 5 lines
Fix for the minfx version checking logic in the dep_check module.
Now newer versions of minfx will be handled.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/dep_check.py
branches/frame_order_cleanup/docs/Release_Checklist
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 2 11:19:53 2014
@@ -1 +1 @@
-/trunk:1-25506
+/trunk:1-25532
Modified: branches/frame_order_cleanup/dep_check.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/dep_check.py?rev=25534&r1=25533&r2=25534&view=diff
==============================================================================
--- branches/frame_order_cleanup/dep_check.py (original)
+++ branches/frame_order_cleanup/dep_check.py Tue Sep 2 11:19:53 2014
@@ -55,7 +55,7 @@
try:
import minfx
ver = minfx.__version__.split('.')
- if not (minfx.__version__ == 'trunk' or (int(ver[0]) <= 1 and
int(ver[1]) <= 0 and int(ver[2]) <= 9)):
+ if not (minfx.__version__ == 'trunk' or not (int(ver[0]) <= 1 and
int(ver[1]) <= 0 and int(ver[2]) <= 9)):
sys.stderr.write("Version %s of the 'minfx' dependency is too old,
minfx >= 1.0.9 is required.\n" % minfx.__version__)
sys.exit()
except ImportError:
Modified: branches/frame_order_cleanup/docs/Release_Checklist
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/Release_Checklist?rev=25534&r1=25533&r2=25534&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/Release_Checklist (original)
+++ branches/frame_order_cleanup/docs/Release_Checklist Tue Sep 2 11:19:53
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.9/minfx
+$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/tags/1.0.10/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.9/minfx
+$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/tags/1.0.10/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.9/minfx
+$ svn co http://svn.gna.org/svn/minfx/tags/1.0.10/minfx
$ svn co http://svn.gna.org/svn/bmrblib/tags/1.0.3/bmrblib
$ scons binary_dist
r25534 - in /branches/frame_order_cleanup: ./ dep_check.py docs/Release_Checklist