Merge remote-tracking branch 'upstream/master' into enh/smriprep

Author: oesteban

.circleci/config.yml

@@ -358,10 +358,10 @@ jobs:
           at: /tmp
       - restore_cache:
           keys:
-            - ds005-anat-v12-{{ .Branch }}-{{ epoch }}
-            - ds005-anat-v12-{{ .Branch }}
-            - ds005-anat-v12-master
-            - ds005-anat-v12-
+            - ds005-anat-v13-{{ .Branch }}-{{ epoch }}
+            - ds005-anat-v13-{{ .Branch }}
+            - ds005-anat-v13-master
+            - ds005-anat-v13-
       - run:
           name: Setting up test
           command: |
@@ -395,10 +395,9 @@ jobs:
                 --sloppy --write-graph --mem_mb 4096 \
                 --nthreads 2 --anat-only -vv
       - save_cache:
-         key: ds005-anat-v12-{{ .Branch }}-{{ epoch }}
+         key: ds005-anat-v13-{{ .Branch }}-{{ epoch }}
          paths:
             - /tmp/ds005/work
-            - /tmp/ds005/derivatives/fmriprep
 
       - run:
           name: Run full fMRIPrep on ds005 (LegacyMultiProc plugin)
@@ -489,10 +488,10 @@ jobs:
           at: /tmp
       - restore_cache:
           keys:
-            - ds054-anat-v10-{{ .Branch }}-{{ epoch }}
-            - ds054-anat-v10-{{ .Branch }}
-            - ds054-anat-v10-master
-            - ds054-anat-v10-
+            - ds054-anat-v11-{{ .Branch }}-{{ epoch }}
+            - ds054-anat-v11-{{ .Branch }}
+            - ds054-anat-v11-master
+            - ds054-anat-v11-
       - run:
           name: Setting up test
           command: |
@@ -526,10 +525,9 @@ jobs:
                 --fs-no-reconall --sloppy --write-graph \
                 --mem_mb 4096 --nthreads 2 --anat-only -vv
       - save_cache:
-         key: ds054-anat-v10-{{ .Branch }}-{{ epoch }}
+         key: ds054-anat-v11-{{ .Branch }}-{{ epoch }}
          paths:
             - /tmp/ds054/work
-            - /tmp/ds054/derivatives
 
       - run:
           name: Run full fMRIPrep on ds054
@@ -608,10 +606,10 @@ jobs:
           at: /tmp
       - restore_cache:
           keys:
-            - ds210-anat-v8-{{ .Branch }}-{{ epoch }}
-            - ds210-anat-v8-{{ .Branch }}
-            - ds210-anat-v8-master
-            - ds210-anat-v8-
+            - ds210-anat-v9-{{ .Branch }}-{{ epoch }}
+            - ds210-anat-v9-{{ .Branch }}
+            - ds210-anat-v9-master
+            - ds210-anat-v9-
       - run:
           name: Setting up test
           command: |
@@ -645,10 +643,9 @@ jobs:
                 --fs-no-reconall --sloppy --write-graph \
                 --mem_mb 4096 --nthreads 2 --anat-only -vv
       - save_cache:
-         key: ds210-anat-v8-{{ .Branch }}-{{ epoch }}
+         key: ds210-anat-v9-{{ .Branch }}-{{ epoch }}
          paths:
             - /tmp/ds210/work
-            - /tmp/ds210/derivatives
 
       - run:
           name: Run full fMRIPrep on ds000210

fmriprep/cli/run.py

@@ -762,6 +762,7 @@ def build_workflow(opts, retval):
         cmd = ['pandoc', '-s', '--bibliography',
                pkgrf('fmriprep', 'data/boilerplate.bib'),
                '--filter', 'pandoc-citeproc',
+               '--metadata', 'pagetitle="fMRIPrep citation boilerplate"',
                str(logs_path / 'CITATION.md'),
                '-o', str(logs_path / 'CITATION.html')]
         try: