Merge pull request #2399 from mgxd/rel/1.0.0

rel: 1.0.0

Author: mgxd

CHANGES

@@ -1,6 +1,8 @@
-Upcoming release (1.0.0)
+1.0.0 (January 24, 2018)
 ========================
 
+###### [Full changelog](https://github.com/nipy/nipype/milestone/16?closed=1)
+
 * FIX: PBS plugin submissions (https://github.com/nipy/nipype/pull/2344)
 * FIX: Graph plugins submissions (https://github.com/nipy/nipype/pull/2359)
 * FIX: Logging error if % in interface command (https://github.com/nipy/nipype/pull/2364)
@@ -22,6 +24,7 @@ Upcoming release (1.0.0)
 * STY: Cleanup of PEP8 violations (https://github.com/nipy/nipype/pull/2358)
 * STY: Cleanup of trailing spaces and adding of missing newlines at end of files (https://github.com/nipy/nipype/pull/2355)
 * STY: Apply yapf to codebase (https://github.com/nipy/nipype/pull/2371)
+* DOC: Updated guide for contributing (https://github.com/nipy/nipype/pull/2393)
 
 0.14.0 (November 29, 2017)
 ==========================

doc/conf.py

@@ -82,7 +82,7 @@
 # The short X.Y version.
 version = nipype.__version__
 # The full version, including alpha/beta/rc tags.
-release = "0.14.0"
+release = "1.0.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/documentation.rst

@@ -9,7 +9,7 @@ Documentation
    :Release: |version|
    :Date: |today|
 
-Previous versions:  `0.13.1 <http://nipype.readthedocs.io/en/0.13.1/>`_ `0.12.1 <http://nipype.readthedocs.io/en/0.12.1/>`_
+Previous versions: `0.14.0 <http://nipype.readthedocs.io/en/v0.14.0/>`_ `0.13.1 <http://nipype.readthedocs.io/en/0.13.1/>`_
 
 
 .. container:: doc2

nipype/info.py

@@ -11,7 +11,7 @@
 # full release.  '.dev' as a version_extra string means this is a development
 # version
 # Remove -dev for release
-__version__ = '0.14.1-dev'
+__version__ = '1.0.0'
 
 
 def get_nipype_gitversion():

nipype/pipeline/plugins/pbs.py

@@ -57,9 +57,9 @@ def _is_pending(self, taskid):
 
         stdout = result.runtime.stdout
         stderr = result.runtime.stderr
-        errmsg = 'Unknown Job Id' 
+        errmsg = 'Unknown Job Id'
         success = 'Job has finished'
-        if (success in stderr) or ('job_state = C' in stdout):  
+        if (success in stderr) or ('job_state = C' in stdout):
             return False
         else:
             return errmsg not in stderr