r25963 - in /branches/frame_order_cleanup: ./ dep_check.py -- September 23, 2014 - 10:01

Author: bugman
Date: Tue Sep 23 10:01:34 2014
New Revision: 25963

URL: http://svn.gna.org/viewcvs/relax?rev=25963&view=rev
Log:
Merged revisions 25962 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r25962 | bugman | 2014-09-23 10:00:21 +0200 (Tue, 23 Sep 2014) | 8 lines
  
  Updated the minimum minfx dependency version number from 1.0.9 to 1.0.11 in 
the dep_check module.
  
  This newest version handles infinite target function values preventing 
optimisation from continuing
  forever (https://gna.org/forum/forum.php?forum_id=2477).  The 1.0.10 
version is also useful as there
  is full support for gradients and Hessians in the log-barrier constraint 
algorithm
  (https://gna.org/forum/forum.php?forum_id=2475).
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/dep_check.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 23 10:01:34 2014
@@ -1 +1 @@
-/trunk:1-25958
+/trunk:1-25962

Modified: branches/frame_order_cleanup/dep_check.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/dep_check.py?rev=25963&r1=25962&r2=25963&view=diff
==============================================================================
--- branches/frame_order_cleanup/dep_check.py   (original)
+++ branches/frame_order_cleanup/dep_check.py   Tue Sep 23 10:01:34 2014
@@ -86,9 +86,9 @@
 # Minfx python package check.
 try:
     import minfx
-    min_version = '1.0.9'
+    min_version = '1.0.11'
     if not minfx.__version__ == 'trunk' and 
version_comparison(minfx.__version__, min_version) == -1:
-        sys.stderr.write("Version %s of the 'minfx' dependency is too old, 
minfx >= 1.0.9 is required.\n" % minfx.__version__)
+        sys.stderr.write("Version %s of the 'minfx' dependency is too old, 
minfx >= %s is required.\n" % (minfx.__version__, min_version))
         sys.exit()
 except ImportError:
     sys.stderr.write("The dependency 'minfx' has not been installed (see 
https://gna.org/projects/minfx/).\n")