mailr28012 - /trunk/dep_check.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on October 07, 2015 - 11:45:
Author: bugman
Date: Wed Oct  7 11:45:37 2015
New Revision: 28012

URL: http://svn.gna.org/viewcvs/relax?rev=28012&view=rev
Log:
Fix for the numpy version number checking in the dep_check module.

The version_comparison() function is now being used to compare numbers, 
replacing the previous hack.


Modified:
    trunk/dep_check.py

Modified: trunk/dep_check.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/dep_check.py?rev=28012&r1=28011&r2=28012&view=diff
==============================================================================
--- trunk/dep_check.py  (original)
+++ trunk/dep_check.py  Wed Oct  7 11:45:37 2015
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2008-2014 Edward d'Auvergne                                  
 #
+# Copyright (C) 2008-2015 Edward d'Auvergne                                  
 #
 # Copyright (C) 2014 Troels E. Linnet                                        
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
@@ -69,7 +69,7 @@
 # numpy.
 try:
     import numpy
-    if float(numpy.version.version[:3]) < 1.6:
+    if version_comparison(numpy.version.version, '1.6') == -1:
         sys.stderr.write("Version %s of the 'numpy' dependency is not 
supported, numpy >= 1.6 is required.\n" % numpy.version.version)
         sys.exit()
 except ImportError:




Related Messages


Powered by MHonArc, Updated Wed Oct 07 15:00:03 2015