Merge branch 'master' into rf/niworkflows-upstream

effigies · web-flow · commit e6d8bab01efd · 2018-12-14T18:20:30.000-05:00
diff --git a/.circleci/ds005_outputs.txt b/.circleci/ds005_outputs.txt
@@ -1,6 +1,7 @@
 fmriprep
 fmriprep/dataset_description.json
 fmriprep/logs
+fmriprep/logs/CITATION.bib
 fmriprep/logs/CITATION.html
 fmriprep/logs/CITATION.md
 fmriprep/logs/CITATION.tex
diff --git a/.circleci/ds005_partial_outputs.txt b/.circleci/ds005_partial_outputs.txt
@@ -1,6 +1,7 @@
 fmriprep
 fmriprep/dataset_description.json
 fmriprep/logs
+fmriprep/logs/CITATION.bib
 fmriprep/logs/CITATION.html
 fmriprep/logs/CITATION.md
 fmriprep/logs/CITATION.tex
diff --git a/.circleci/ds054_outputs.txt b/.circleci/ds054_outputs.txt
@@ -1,6 +1,7 @@
 fmriprep
 fmriprep/dataset_description.json
 fmriprep/logs
+fmriprep/logs/CITATION.bib
 fmriprep/logs/CITATION.html
 fmriprep/logs/CITATION.md
 fmriprep/logs/CITATION.tex
diff --git a/.circleci/ds210_outputs.txt b/.circleci/ds210_outputs.txt
@@ -1,6 +1,7 @@
 fmriprep
 fmriprep/dataset_description.json
 fmriprep/logs
+fmriprep/logs/CITATION.bib
 fmriprep/logs/CITATION.html
 fmriprep/logs/CITATION.md
 fmriprep/logs/CITATION.tex
diff --git a/.zenodo.json b/.zenodo.json
@@ -98,6 +98,11 @@
       "affiliation": "Department of Psychology, Columbia University",
       "orcid": "0000-0001-7936-9991"
     },
+    {
+      "name": "Stojic, Hrvoje",
+      "affiliation": "University College London",
+      "orcid": "0000-0002-9699-9052"
+    },
     {
       "name": "Poldrack, Russell A.",
       "affiliation": "Department of Psychology, Stanford University",
diff --git a/fmriprep/cli/run.py b/fmriprep/cli/run.py
@@ -550,6 +550,7 @@ def build_workflow(opts, retval):
     """
     from subprocess import check_call, CalledProcessError, TimeoutExpired
     from pkg_resources import resource_filename as pkgrf
+    from shutil import copyfile
 
     from nipype import logging, config as ncfg
     from niworkflows.utils.bids import collect_participants
@@ -769,6 +770,10 @@ def build_workflow(opts, retval):
         except (FileNotFoundError, CalledProcessError, TimeoutExpired):
             logger.warning('Could not generate CITATION.tex file:\n%s',
                            ' '.join(cmd))
+        else:
+             copyfile(pkgrf('fmriprep', 'data/boilerplate.bib'),
+                      str(logs_path / 'CITATION.bib'))
+
     return retval
 
 
