Merge branch 'release0.9'

Author: chrisgorgo

CHANGES

@@ -1,4 +1,4 @@
-Next release
+Release 0.9.0 (December 20, 2013)
 ============
 
 * ENH: SelectFiles: a streamlined version of DataGrabber

doc/_templates/sidebar_versions.html

@@ -17,7 +17,7 @@ <h3>{{ _('Versions') }}</h3>
                 <td align="left">Release</td><td align="right">Devel</td>
             </tr>
             <tr>
-                <td align="left">0.8.0</td><td align="right">pre-0.9</td>
+                <td align="left">0.9.0</td><td align="right">1.0-dev</td>
             </tr>
             <tr>
                 <td align="left"><a href="{{pathto('users/install')}}">Download</a></td>

doc/documentation.rst

@@ -9,7 +9,7 @@ Documentation
    :Release: |version|
    :Date: |today|
 
-Previous versions: `0.7 <http://nipy.org/nipype/0.7>`_ `0.6 <http://nipy.org/nipype/0.6>`_
+Previous versions:  `0.8 <http://nipy.org/nipype/0.8>`_ `0.7 <http://nipy.org/nipype/0.7>`_
 
 .. container:: doc2
 

doc/users/install.rst

@@ -9,10 +9,10 @@ This page covers the necessary steps to install Nipype.
 Download
 --------
 
-Release 0.8.0: [`zip <https://github.com/nipy/nipype/archive/0.8.zip>`__ `tar.gz
-<https://github.com/nipy/nipype/archive/0.8.tar.gz>`__]
+Release 0.9.0: [`zip <https://github.com/nipy/nipype/archive/0.9.zip>`__ `tar.gz
+<https://github.com/nipy/nipype/archive/0.9.tar.gz>`__]
 
-Development: [`zip <http://github.com/nipy/nipype/zipball/master>`__ `tar.gz 
+Development: [`zip <http://github.com/nipy/nipype/zipball/master>`__ `tar.gz
 <http://github.com/nipy/nipype/tarball/master>`__]
 
 `Prior downloads <http://github.com/nipy/nipype/tags>`_
@@ -156,29 +156,29 @@ These are the software packages that nipype.interfaces wraps:
 FSL_
   4.1.0 or later
 
-matlab_ 
+matlab_
   2008a or later
 
 SPM_
   SPM5/8
 
 FreeSurfer_
   FreeSurfer version 4 and higher
-  
+
 AFNI_
   2009_12_31_1431 or later
 
 Slicer_
   3.6 or later
 
-Nipy_ 
+Nipy_
   0.1.2+20110404 or later
 
-Nitime_ 
+Nitime_
   (optional)
-  
+
 Camino_
-  
+
 Camino2Trackvis_
 
 ConnectomeViewer_

nipype/info.py

@@ -10,7 +10,7 @@
 _version_major = 0
 _version_minor = 9
 _version_micro = 0
-_version_extra = '.pre'
+_version_extra = ''
 
 def get_nipype_gitversion():
     """Nipype version as reported by the last commit in git

setup.py

@@ -91,6 +91,7 @@ def main(**extra_args):
           author_email=INFO_VARS['AUTHOR_EMAIL'],
           platforms=INFO_VARS['PLATFORMS'],
           version=INFO_VARS['VERSION'],
+          install_requires=INFO_VARS['REQUIRES'],
           requires=INFO_VARS['REQUIRES'],
           configuration = configuration,
           cmdclass = cmdclass,