update release notes and whitespace for 1.6.0 tag

desihub · Jul 1, 2016 · ccb7f1a · ccb7f1a
1 parent b076612
commit ccb7f1a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/doc/changes.rst b/doc/changes.rst
@@ -2,10 +2,11 @@
 Change Log
 ==========
 
-1.5.1 (unreleased)
+1.6.0 (2016-07-01)
 ------------------
 
 * Fixed some import statements so documentation will build on readthedocs.
+* depend.add_dependencies() to add DEPNAM/DEPVER for common DESI dependencies
 
 1.5.0 (2016-06-09)
 ------------------

diff --git a/py/desiutil/_version.py b/py/desiutil/_version.py
@@ -1 +1 @@
-__version__ = '1.5.0.dev325'
+__version__ = '1.6.0'
diff --git a/py/desiutil/depend.py b/py/desiutil/depend.py
@@ -136,23 +136,23 @@ def iterdep(header):
 
 def add_dependencies(header, module_names=None):
     '''Adds DEPNAMnn, DEPVERnn keywords to header for imported modules
-    
+
     Args:
         header : dict-like object, e.g. astropy.io.fits.Header
-    
+
     Options:
         module_names : list of module names to check
             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__
     if available, otherwise "unknown (/path/to/module/)".
     '''
     import sys
     import importlib
-    
+
     setdep(header, 'python', sys.version.replace('\n', ' '))
-    
+
     if module_names is None:
         module_names = possible_dependencies
 
@@ -170,7 +170,7 @@ def add_dependencies(header, module_names=None):
                 version = 'unknown ({})'.format(x.__file__)
             else:
                 version = 'unknown'
-                
+
             setdep(header, module, version)
 
 class Dependencies(object):

diff --git a/py/desiutil/test/test_depend.py b/py/desiutil/test/test_depend.py
@@ -153,14 +153,13 @@ def test_add_dependencies(self):
         add_dependencies(hdr, ['blatbar', 'quatlarm'])
         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__':