expose list of default dependencies to check

desihub · Jun 10, 2016 · bad9ea6 · bad9ea6
1 parent 19da71c
commit bad9ea6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/py/desiutil/depend.py b/py/desiutil/depend.py
@@ -126,6 +126,14 @@ def iterdep(header):
 
     raise StopIteration
 
+#- default possible dependencies to check in add_dependencies()
+possible_dependencies = [
+    'numpy', 'scipy', 'astropy', 'yaml', 'matplotlib',
+    'requests', 'fitsio', 'h5py', 'mpi4py', 'psycopg2',
+    'desiutil', 'desispec', 'desitarget', 'desimodel', 'desisim',
+    'redmonster', 'specter', 'speclite', 'specsim',
+    ]
+
 def add_dependencies(header, module_names=None):
     '''Adds DEPNAMnn, DEPVERnn keywords to header for imported modules
     
@@ -134,7 +142,7 @@ def add_dependencies(header, module_names=None):
     
     Options:
         module_names : list of module names to check
-            if None, check a list of known potential DESI dependencies
+            if None, checks desiutil.depend.possible_dependencies
         
     Only adds the dependency keywords if the module has already been
     previously loaded in this python session.  Uses module.__version__
@@ -146,25 +154,22 @@ def add_dependencies(header, module_names=None):
     setdep(header, 'python', sys.version.replace('\n', ' '))
 
     if module_names is None:
-        module_names = [
-            'numpy', 'scipy', 'astropy', 'yaml', 'matplotlib',
-            'requests', 'fitsio', 'h5py', 'mpi4py', 'psycopg2',
-            'desiutil', 'desispec', 'desitarget', 'desimodel', 'desisim',
-            'redmonster',
-            'specter', 'speclite', 'specsim',
-            ]
-
+        module_names = possible_dependencies
 
     #- Set version strings only for modules that have already been loaded
     for module in module_names:
         if module in sys.modules:
             #- already loaded, but we need a reference to the module object
             x = importlib.import_module(module)
-            try:
+            if hasattr(x, '__version__'):
                 version = x.__version__
-            except AttributeError:
+            elif hasattr(x, '__path__'):
                 #- e.g. redmonster doesn't set __version__
                 version = 'unknown ({})'.format(x.__path__[0])
+            elif hasattr(x, '__file__'):
+                version = 'unknown ({})'.format(x.__file__)
+            else:
+                version = 'unknown'
 
             setdep(header, module, version)
 

diff --git a/py/desiutil/test/test_depend.py b/py/desiutil/test/test_depend.py
@@ -154,6 +154,13 @@ def test_add_dependencies(self):
         self.assertFalse(hasdep(hdr, 'blatbar'))
         self.assertFalse(hasdep(hdr, 'quatlarm'))
 
+        #- no .__version__
+        add_dependencies(hdr, ['os.path', 'sys'])
+        self.assertTrue(hasdep(hdr, 'os.path'))
+        self.assertTrue(getdep(hdr, 'os.path').startswith('unknown'))
+        self.assertTrue(hasdep(hdr, 'sys'))
+        self.assertTrue(getdep(hdr, 'sys').startswith('unknown'))
+
 
 
 if __name__ == '__main__':