Merge pull request #2633 from nipy/rel/1.1.0

rel: 1.1.0

Author: mgxd

doc/changelog/1.X.X-changelog

@@ -1,3 +1,20 @@
+1.1.0 (July 03, 2018)
+=====================
+
+###### [Full changelog](https://github.com/nipy/nipype/milestone/21?closed=1)
+
+  * RF: Futures-based MultiProc (https://github.com/nipy/nipype/pull/2598)
+  * FIX: Avoid closing file descriptors on Windows (https://github.com/nipy/nipype/pull/2617)
+  * MAINT: Play nice with external logging (https://github.com/nipy/nipype/pull/2611)
+  * MAINT: Remove ignore_exception and terminal_output traits from input specs (https://github.com/nipy/nipype/pull/2618)
+  * MAINT: Converge autotest names (https://github.com/nipy/nipype/pull/2610)
+  * ENH: Add versioning metadata to crash files (https://github.com/nipy/nipype/pull/2626)
+  * ENH add -dsort option to TProject (https://github.com/nipy/nipype/pull/2623)
+  * ENH: Add Rescale interface (https://github.com/nipy/nipype/pull/2599)
+  * DOC: Improve documentation for ANTs/FSL interfaces (https://github.com/nipy/nipype/pull/2593)
+  * CI: Stop using Miniconda on Travis (https://github.com/nipy/nipype/pull/2600)
+  * CI: Add PyPI validation on rel/* branches (https://github.com/nipy/nipype/pull/2603)
+
 1.0.4 (May 29, 2018)
 ====================
 

doc/conf.py

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

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__ = '1.1.0-dev'
+__version__ = '1.1.0'
 
 
 def get_nipype_gitversion():

nipype/interfaces/ants/tests/test_auto_AntsJointFusion.py

@@ -52,8 +52,8 @@ def test_AntsJointFusion_inputs():
             hash_files=False,
         ),
         out_label_post_prob_name_format=dict(
-            requires=['out_label_fusion',
-                      'out_intensity_fusion_name_format'], ),
+            requires=['out_label_fusion', 'out_intensity_fusion_name_format'],
+        ),
         patch_metric=dict(argstr='-m %s', ),
         patch_radius=dict(
             argstr='-p %s',