r22563 - in /branches/double_rotor: ./ dep_check.py info.py -- March 27, 2014 - 16:28

Author: bugman
Date: Thu Mar 27 16:28:18 2014
New Revision: 22563

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

........
  r22558 | bugman | 2014-03-27 10:29:18 +0100 (Thu, 27 Mar 2014) | 6 lines
  
  Added matplotlib detection to the dep_check module.
  
  This follows step 1 from the planning document at
  http://thread.gmane.org/gmane.science.nmr.relax.devel/5278.
........
  r22559 | bugman | 2014-03-27 10:31:23 +0100 (Thu, 27 Mar 2014) | 6 lines
  
  Added matplotlib to the info module.
  
  This follows step 1 from the planning document at
  http://thread.gmane.org/gmane.science.nmr.relax.devel/5278.
........

Modified:
    branches/double_rotor/   (props changed)
    branches/double_rotor/dep_check.py
    branches/double_rotor/info.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 27 16:28:18 2014
@@ -1 +1 @@
-/trunk:1-22556
+/trunk:1-22559

Modified: branches/double_rotor/dep_check.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/dep_check.py?rev=22563&r1=22562&r2=22563&view=diff
==============================================================================
--- branches/double_rotor/dep_check.py  (original)
+++ branches/double_rotor/dep_check.py  Thu Mar 27 16:28:18 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).         
 #
 #                                                                            
 #
@@ -85,6 +85,13 @@
     readline_module = True
 except ImportError:
     readline_module = False
+
+# matplotlib module.
+try:
+    import matplotlib
+    matplotlib_module = True
+except ImportError:
+    matplotlib_module = False
 
 # runpy module.
 try:

Modified: branches/double_rotor/info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/info.py?rev=22563&r1=22562&r2=22563&view=diff
==============================================================================
--- branches/double_rotor/info.py       (original)
+++ branches/double_rotor/info.py       Thu Mar 27 16:28:18 2014
@@ -397,6 +397,16 @@
         try:
             version.append(dep_check.wx.version())
             path.append(dep_check.wx.__path__[0])
+        except:
+            version.append('')
+            path.append('')
+
+        # matplotlib.
+        package.append('matplotlib')
+        status.append(dep_check.matplotlib_module)
+        try:
+            version.append(dep_check.matplotlib.__version__)
+            path.append(dep_check.matplotlib.__path__[0])
         except:
             version.append('')
             path.append('')