Merge pull request #3146 from effigies/bp/1.4.x/cherrypicking

Omnibus backport for 1.4.x

Author: effigies

Diff for: .circleci/build_docs.sh

@@ -99,7 +99,6 @@ _run_codecov_smoke: &_run_codecov_smoke
 
 version: 2
 jobs:
-
   compare_base_dockerfiles:
     docker:
       - image: docker:17.10.0-ce-git
@@ -158,13 +157,6 @@ jobs:
       - run: *_run_codecov_coverage
       - store_artifacts: *store_artifacts_kwds
       - store_test_results: *store_artifacts_kwds
-      - run:
-          name: Build docs
-          no_output_timeout: 30m
-          environment: *test_environment
-          command: bash -ux /home/circleci/nipype/.circleci/build_docs.sh
-      - store_artifacts:
-          path: /home/circleci/work/docs
       - run:
           name: Save Docker images to workspace if on master
           no_output_timeout: 60m
@@ -394,10 +386,44 @@ jobs:
               ssh-add ~/.ssh/id_ed25519
               /home/circleci/nipype/tools/feedstock.sh
 
+  build_docs:
+    docker:
+      - image: python:3.7.4
+    working_directory: /tmp/src/nipype
+    environment:
+      - FSLOUTPUTTYPE: 'NIFTI'
+    steps:
+      - checkout
+      - run:
+          name: Check Python version and upgrade pip
+          command: |
+            python --version
+            python -m pip install -U pip
+      - run:
+          name: Install graphviz
+          command: |
+              apt-get update
+              apt-get install -y graphviz
+      - run:
+          name: Install Requirements (may contain pinned versions)
+          command: python -m pip install -r doc/requirements.txt
+      - run:
+          name: Install NiPype
+          command: python -m pip install ".[doc]"
+      - run:
+          name: Build documentation
+          command: make -C doc html
+      - store_artifacts:
+          path: /tmp/src/nipype/doc/_build/html
+
 workflows:
   version: 2
   build_test_deploy:
     jobs:
+      - build_docs:
+          filters:
+            tags:
+              only: /.*/
       - pypi_precheck:
           filters:
             branches:
@@ -406,21 +432,39 @@ workflows:
               only: /.*/
       - compare_base_dockerfiles:
           filters:
+            branches:
+              ignore:
+                - /docs?\/.*/
             tags:
               only: /.*/
       - test_pytest:
           filters:
+            branches:
+              ignore:
+                - /docs?\/.*/
             tags:
               only: /.*/
           requires:
             - compare_base_dockerfiles
       - test_fmri_fsl_spm:
+          filters:
+            branches:
+              ignore:
+                - /docs?\/.*/
           requires:
             - compare_base_dockerfiles
       - test_fmri_spm_dartel_multiproc:
+          filters:
+            branches:
+              ignore:
+                - /docs?\/.*/
           requires:
             - compare_base_dockerfiles
       - test_fmri_spm_nested_fsl_feeds:
+          filters:
+            branches:
+              ignore:
+                - /docs?\/.*/
           requires:
             - compare_base_dockerfiles
       - deploy_dockerhub:

Diff for: .circleci/config.yml

@@ -22,13 +22,12 @@ src/
 .git
 
 # other
-docs/**/*
-docs/
+doc/**/*
+doc/
 .cache/
 .circle/**/*
 .circle/
 circle.yml
-rtd_requirements.txt
 Vagrantfile
 .travis.yml
 .mailmap

Diff for: .dockerignore

@@ -67,6 +67,7 @@ Gio Piantoni <[email protected]>
 Guillaume Flandin <[email protected]>
 Hans Johnson <[email protected]> <[email protected]>
 Horea Christian <[email protected]> <[email protected]>
+Hrvoje Stojic <[email protected]>
 Isaac Schwabacher <[email protected]>
 Jakub Kaczmarzyk <[email protected]>
 James Kent <[email protected]>

Diff for: .mailmap

@@ -514,6 +514,11 @@
     {
       "name": "Blair, Ross"
     },
+    {
+      "affiliation": "Max Planck UCL Centre for Computational Psychiatry and Ageing Research, University College London",
+      "name": "Stojic, Hrvoje",
+      "orcid": "0000-0002-9699-9052"
+    },
     {
       "affiliation": "The University of Texas at Austin",
       "name": "Floren, Andrew",

Diff for: .zenodo.json

@@ -4,7 +4,6 @@ include MANIFEST.in
 include	README
 include THANKS
 include Makefile
-include build_docs.py
 include setup_egg.py
 include doc/documentation.zip
 include nipype/COMMIT_INFO.txt