fix: resolved conflicts

Author: satra

.zenodo.json

@@ -74,20 +74,20 @@
       "affiliation": "Department of Psychology, Stanford University",
       "name": "Waskom, Michael"
     },
-    {
-      "affiliation": "Developer",
-      "name": "Clark, Daniel",
-      "orcid": "0000-0002-8121-8954"
-    },
     {
       "affiliation": "Shattuck Lab, UCLA Brain Mapping Center",
       "name": "Wong, Jason"
     },
+    {
+      "name": "Modat, Marc"
+    },
     {
       "name": "Loney, Fred"
     },
     {
-      "name": "Modat, Marc"
+      "affiliation": "Developer",
+      "name": "Clark, Daniel",
+      "orcid": "0000-0002-8121-8954"
     },
     {
       "affiliation": "Department of Electrical and Computer Engineering, Johns Hopkins University",
@@ -141,16 +141,6 @@
     {
       "name": "Berleant, Shoshana"
     },
-    {
-      "affiliation": "MIT",
-      "name": "Kaczmarzyk, Jakub",
-      "orcid": "0000-0002-5544-7577"
-    },
-    {
-      "affiliation": "INRIA",
-      "name": "Varoquaux, Gael",
-      "orcid": "0000-0003-1076-5122"
-    },
     {
       "affiliation": "UC San Diego",
       "name": "Cipollini, Ben",
@@ -176,9 +166,24 @@
       "name": "DuPre, Elizabeth",
       "orcid": "0000-0003-1358-196X"
     },
+    {
+      "affiliation": "MIT",
+      "name": "Kaczmarzyk, Jakub",
+      "orcid": "0000-0002-5544-7577"
+    },
     {
       "name": "Moloney, Brendan"
     },
+    {
+      "affiliation": "INRIA",
+      "name": "Varoquaux, Gael",
+      "orcid": "0000-0003-1076-5122"
+    },
+    {
+      "affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
+      "name": "Horea, Christian",
+      "orcid": "0000-0001-7037-2449"
+    },
     {
       "affiliation": "Athena EPI, Inria Sophia-Antipolis",
       "name": "Wassermann , Demian",
@@ -189,11 +194,6 @@
       "name": "Hanke, Michael",
       "orcid": "0000-0001-6398-6370"
     },
-    {
-      "affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
-      "name": "Horea, Christian",
-      "orcid": "0000-0001-7037-2449"
-    },
     {
       "affiliation": "Vrije Universiteit, Amsterdam",
       "name": "Gilles de Hollander",
@@ -268,11 +268,6 @@
     {
       "name": "Cumba, Chad"
     },
-    {
-      "affiliation": "Harvard University - Psychology",
-      "name": "Kastman, Erik",
-      "orcid": "0000-0001-7221-9042"
-    },
     {
       "affiliation": "SRI International",
       "name": "Nichols, B. Nolan",
@@ -283,6 +278,11 @@
       "name": "Eshaghi, Arman",
       "orcid": "0000-0002-6652-3512"
     },
+    {
+      "affiliation": "Harvard University - Psychology",
+      "name": "Kastman, Erik",
+      "orcid": "0000-0001-7221-9042"
+    },
     {
       "name": "Ginsburg, Daniel"
     },
@@ -297,8 +297,9 @@
       "orcid": "0000-0001-6392-6634"
     },
     {
-      "affiliation": "Child Mind Institute",
-      "name": "Giavasis, Steven"
+      "affiliation": "University of Zurich",
+      "name": "Liem, Franz",
+      "orcid": "0000-0003-0646-4810"
     },
     {
       "affiliation": "UniversityHospital Heidelberg, Germany",
@@ -308,7 +309,8 @@
       "name": "Erickson, Drew"
     },
     {
-      "name": "K\u00fcttner, Ren\u00e9"
+      "affiliation": "Child Mind Institute",
+      "name": "Giavasis, Steven"
     },
     {
       "name": "Haselgrove, Christian"
@@ -320,7 +322,7 @@
       "name": "Ghayoor, Ali"
     },
     {
-      "name": "Liem, Franz"
+      "name": "K\u00fcttner, Ren\u00e9"
     },
     {
       "name": "Millman, Jarrod"
@@ -383,10 +385,6 @@
       "name": "Chetverikov, Andrey",
       "orcid": "0000-0003-2767-6310"
     },
-    {
-      "affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany",
-      "name": "Weninger, Leon"
-    },
     {
       "name": "Salvatore, John"
     },
@@ -401,9 +399,6 @@
       "name": "Craddock, R. Cameron",
       "orcid": "0000-0002-4950-1303"
     },
-    {
-      "name": "Inati, Souheil"
-    },
     {
       "name": "Hinds, Oliver"
     },
@@ -412,6 +407,13 @@
       "name": "Cooper, Gavin",
       "orcid": "0000-0002-7186-5293"
     },
+    {
+      "affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany",
+      "name": "Weninger, Leon"
+    },
+    {
+      "name": "Inati, Souheil"
+    },
     {
       "affiliation": "Boston University",
       "name": "Perkins, L. Nathan"
@@ -441,9 +443,6 @@
       "name": "Floren, Andrew",
       "orcid": "0000-0003-3618-2056"
     },
-    {
-      "name": "Rothmei, Simon"
-    },
     {
       "name": "Urchs, Sebastian"
     },
@@ -463,6 +462,11 @@
       "name": "Geisler, Daniel",
       "orcid": "0000-0003-2076-5329"
     },
+    {
+      "affiliation": "University of Texas at Austin",
+      "name": "De La Vega, Alejandro",
+      "orcid": "0000-0001-9062-3778"
+    },
     {
       "affiliation": "University of illinois urbana champaign",
       "name": "Sharp, Paul"
@@ -491,6 +495,9 @@
     {
       "name": "Saase, Victor"
     },
+    {
+      "name": "Rothmei, Simon"
+    },
     {
       "affiliation": "University of Helsinki",
       "name": "Andberg, Sami Kristian",
@@ -516,11 +523,6 @@
     {
       "name": "Tarbert, Claire"
     },
-    {
-      "affiliation": "University of Texas at Austin",
-      "name": "De La Vega, Alejandro",
-      "orcid": "0000-0001-9062-3778"
-    },
     {
       "affiliation": "Vrije Universiteit Amsterdam",
       "name": "Ort, Eduard"
@@ -585,6 +587,11 @@
       "affiliation": "MIT, HMS",
       "name": "Ghosh, Satrajit",
       "orcid": "0000-0002-5312-6729"
+    },
+    {
+      "affiliation": "GIGA Institute",
+      "name": "Grignard, Martin",
+      "orcid": "0000-0001-5549-1861"
     }
   ],
   "keywords": [

README.rst

@@ -11,8 +11,8 @@ NIPYPE: Neuroimaging in Python: Pipelines and Interfaces
 .. image:: https://codecov.io/gh/nipy/nipype/branch/master/graph/badge.svg
   :target: https://codecov.io/gh/nipy/nipype
 
-.. image:: https://www.codacy.com/project/badge/182f27944c51474490b369d0a23e2f32
-  :target: https://www.codacy.com/app/krzysztof-gorgolewski/nipy_nipype
+.. image:: https://api.codacy.com/project/badge/Grade/452bfc0d4de342c99b177d2c29abda7b
+  :target: https://www.codacy.com/app/nipype/nipype?utm_source=github.com&utm_medium=referral&utm_content=nipy/nipype&utm_campaign=Badge_Grade
 
 .. image:: https://img.shields.io/pypi/v/nipype.svg
     :target: https://pypi.python.org/pypi/nipype/

doc/_static/nipy-logo-bg-138x120.png

@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
+<link rel="stylesheet" href="https://www.google.com/cse/style/look/default.css" type="text/css" />
 <style type="text/css">
     a.navbar {
     color: {{ theme_linkcolor }};

doc/_static/reggie2.png

@@ -1,3 +1,42 @@
+1.1.5 (November 08, 2018)
+=========================
+
+Hotfix release.
+
+##### [Full changelog](https://github.com/nipy/nipype/milestone/26?closed=1)
+
+  * ENH: Allow timeouts during SLURM job status checks (https://github.com/nipy/nipype/pull/2767)
+  * RF: Subclass non-daemon variants of all multiprocessing contexts (https://github.com/nipy/nipype/pull/2771)
+
+
+1.1.4 (October 31, 2018)
+========================
+
+##### [Full changelog](https://github.com/nipy/nipype/milestone/25?closed=1)
+
+  * FIX: Python 2.7-3.7.1 compatible NonDaemonPool (https://github.com/nipy/nipype/pull/2754)
+  * FIX: VRML typo (VMRL) in MeshFix (https://github.com/nipy/nipype/pull/2757)
+  * FIX: Refine FSL.split output identification (https://github.com/nipy/nipype/pull/2746)
+  * FIX: Reuse _gen_filename logic in ants.LaplacianThickness (https://github.com/nipy/nipype/pull/2734)
+  * FIX: Remove 'reg_term' default from dwi2tensor interface (https://github.com/nipy/nipype/pull/2731)
+  * FIX: Keep profile files when ``remove_unnecessary_outputs = true`` (https://github.com/nipy/nipype/pull/2718)
+  * ENH: Add afni.LocalStat and afni.ReHo, update afni.ROIStats inputs (https://github.com/nipy/nipype/pull/2740)
+  * ENH: Add compression option for bru2nii (https://github.com/nipy/nipype/pull/2762)
+  * ENH: Add slice_encoding_direction input to TShift (https://github.com/nipy/nipype/pull/2753)
+  * ENH: Add 'sse' output to FSL DTIFit interface (https://github.com/nipy/nipype/pull/2749)
+  * ENH: Update ``ants.LaplacianThickness`` to use ``name_source`` (https://github.com/nipy/nipype/pull/2747)
+  * ENH: Add tab completion for node and interface inputs properties (https://github.com/nipy/nipype/pull/2735)
+  * ENH: enable/disable resource monitor in the fixture per test (https://github.com/nipy/nipype/pull/2725)
+  * TEST: Update expected dotfile text for networkx 1.x (https://github.com/nipy/nipype/pull/2730)
+  * DOC: Move user docs from nipype to nipype_tutorial (https://github.com/nipy/nipype/pull/2726)
+  * DOC: Use consistent name in reconall workflow docstring (https://github.com/nipy/nipype/pull/2758)
+  * MAINT: Use neurodocker 0.4.1 + apt install afni (https://github.com/nipy/nipype/pull/2707)
+  * MAINT: Fix prov and rdflib in nipype (https://github.com/nipy/nipype/pull/2701)
+  * MAINT: Correct readthedocs build error (https://github.com/nipy/nipype/pull/2723)
+  * MAINT: Pin codecov to <5.0 so Travis is fixed (https://github.com/nipy/nipype/pull/2728)
+  * CI: Lock travis pybids 0.6.5 (https://github.com/nipy/nipype/pull/2720)
+
+
 1.1.3 (September 24, 2018)
 ==========================
 

doc/_templates/navbar.html

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

doc/changelog/1.X.X-changelog

@@ -9,7 +9,7 @@ Documentation
    :Release: |version|
    :Date: |today|
 
-Previous versions: `1.1.3 <http://nipype.readthedocs.io/en/1.1.3/>`_ `1.1.2 <http://nipype.readthedocs.io/en/1.1.2/>`_
+Previous versions: `1.1.5 <http://nipype.readthedocs.io/en/1.1.5/>`_ `1.1.4 <http://nipype.readthedocs.io/en/1.1.4/>`_
 
 
 .. container:: doc2
@@ -18,32 +18,6 @@ Previous versions: `1.1.3 <http://nipype.readthedocs.io/en/1.1.3/>`_ `1.1.2 <htt
 
     Be sure to read `Michael's excellent tutorials <https://miykael.github.io/nipype_tutorial/>`_.
 
-  .. admonition:: Guides
-
-    .. hlist::
-       :columns: 2
-
-       * User
-
-         .. toctree::
-            :maxdepth: 2
-
-            users/index
-
-         .. toctree::
-            :maxdepth: 1
-
-            changes
-
-       * Developer
-
-         .. toctree::
-            :maxdepth: 2
-
-            api/index
-            devel/index
-
-
   .. admonition:: Interfaces, Workflows and Examples
 
     .. hlist::
@@ -72,4 +46,23 @@ Previous versions: `1.1.3 <http://nipype.readthedocs.io/en/1.1.3/>`_ `1.1.2 <htt
             interfaces/generated/*algorithms*
             interfaces/generated/*interfaces*
 
+  .. admonition:: Developer Guides
+
+    .. hlist::
+       :columns: 2
+
+       * API
+
+         .. toctree::
+            :maxdepth: 2
+
+            api/index
+
+       * Developer Guide
+
+         .. toctree::
+            :maxdepth: 2
+
+            devel/index
+
 .. include:: links_names.txt