Skip to content

patches for release 0.13.1 #2017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
May 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ab11581
fix: for conda build, restrict configparser requirement to py34 or ea…
satra May 12, 2017
408854c
fix: setuptools to be more precise
satra May 13, 2017
9d775a0
fix: update mailmap to fix contributor aliases
satra May 13, 2017
e0f3f77
fix: revert to 0.13.1 release and address setup issues for conda-forge
satra May 13, 2017
a01ccd9
enh: add current names from google doc
satra May 13, 2017
c1e8552
enh: update to jessie versions for some packages
satra May 14, 2017
3def5cb
enh: updated internal ordering based on lines
satra May 14, 2017
111866f
Merge remote-tracking branch 'upstream/master' into fix/configparser
satra May 18, 2017
b8179bc
Merge remote-tracking branch 'upstream/master' into fix/configparser
satra May 18, 2017
127272b
fix: test if gzipping the docker tar image works
satra May 18, 2017
ec4bf74
fix: typo
satra May 18, 2017
09c3f7c
Update circle.yml
oesteban May 18, 2017
303b982
Update circle.yml
oesteban May 19, 2017
e881288
fix: change to gunzip
satra May 19, 2017
373c3b9
tst: some more checks
satra May 19, 2017
1a85b71
Merge remote-tracking branch 'upstream/master' into fix/configparser
satra May 19, 2017
4bb54d9
fix: save ubuntu and nipype base but use compression
satra May 19, 2017
43a0b0b
fix: compression location
satra May 19, 2017
0a02b1d
fix: white spaces
satra May 19, 2017
fe08e18
fix: add kesshi's details
satra May 19, 2017
eb4d72f
fix: resolved conflicts
satra May 20, 2017
b4e6a51
doc: update changes and point to neurodocker
satra May 20, 2017
bd0ddd7
fix: add nipype latest to cache
satra May 20, 2017
1d3d118
fix: add nipype py36 to cache
satra May 20, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 101 additions & 7 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -1,11 +1,105 @@
Aimi Watanabe <[email protected]> stymy <[email protected]>
Aimi Watanabe <[email protected]> stymy <[email protected]>
Alexander Schaefer <[email protected]> Alexander Schaefer <[email protected]>
Alexander Schaefer <[email protected]> alexschaefer83 <[email protected]>
Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36SD.(none)>
Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
Alexandre M. Savio <[email protected]> Alexandre Manhaes Savio <[email protected]>
Anisha Keshavan <[email protected]> Anisha Keshavan <[email protected]>
Anisha Keshavan <[email protected]> akeshavan <[email protected]>
Ariel Rokem <[email protected]> arokem <[email protected]>
Cindee Madison <[email protected]> cindeem <>
Cindee Madison <[email protected]> cindeem
Chris Filo Gorgolewski <[email protected]> filo <filo@filo-Precision-M6500>
Ariel Rokem <[email protected]> arokem <[email protected]>
Arman Eshaghi <[email protected]> armaneshaghi <[email protected]>
Ashely Gillman <[email protected]> Ashley Gillman <[email protected]>
Ashely Gillman <[email protected]> ashgillman <[email protected]>
Basille Pinsard <[email protected]> bpinsard <[email protected]>
Basille Pinsard <[email protected]> bpinsard <[email protected]>
Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
Benjamin Yvernault <[email protected]> Benjamin Yvernault <[email protected]>
Benjamin Yvernault <[email protected]> byvernault <[email protected]>
Blake Dewey <[email protected]> Blake Dewey <[email protected]>
Blake Dewey <[email protected]> blakedewey <[email protected]>
Blake Dewey <[email protected]> blakedewey <[email protected]>
Brendan Moloney <[email protected]> moloney <[email protected]>
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
Chris Filo Gorgolewski <[email protected]> Chris Gorgolewski <[email protected]>
Chris Filo Gorgolewski <[email protected]> Krzysztof Gorgolewski <[email protected]>
Erik Ziegler <[email protected]> erikz <[email protected]>
Michael Waskom <[email protected]> mwaskom <[email protected]> Michael Waskom <[email protected]> mwaskom <[email protected]>
Chris Filo Gorgolewski <[email protected]> filo <filo@filo-Precision-M6500>
Chris Filo Gorgolewski <[email protected]> filo <filo@filo-dtc-laptop>
Chris Filo Gorgolewski <[email protected]> filo <filo@filolaptop>
Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
Christopher J. Markiewicz <[email protected]> Christopher J. Johnson <[email protected]>
Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
Cindee Madison <[email protected]> cindeem
Cindee Madison <[email protected]> cindeem <>
Colin Buchanan <[email protected]> Colin Buchanan <cbuchanan@cray4.(none)>
Colin Buchanan <[email protected]> colinbuchanan <[email protected]>
Daniel Clark <[email protected]> dclark87 <[email protected]>
Daniel Ginsburg <[email protected]> danginsburg <[email protected]>
Daniel McNamee <[email protected]> danmc <[email protected]>
David Ellis <[email protected]> David Ellis <[email protected]>
David Ellis <[email protected]> David Ellis <[email protected]>
David Welch <[email protected]> David Welch <[email protected]>
Dmytro <[email protected]> belevtsoff <[email protected]>
Erik Ziegler <[email protected]> Erik <[email protected]>
Erik Ziegler <[email protected]> Erik Ziegler <[email protected]>
Erik Ziegler <[email protected]> erik <erik@erik-ubuntu.(none)>
Erik Ziegler <[email protected]> erikz <[email protected]>
Erik Ziegler <[email protected]> swederik <[email protected]>
Fernando Pérez-García <[email protected]> Fernando <[email protected]>
Franz Liem <[email protected]> fliem <[email protected]>
Franz Liem <[email protected]> fliem <franz.liem>
Gael Varoquaux <[email protected]> GaelVaroquaux
Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
Daniel Ginsburg <[email protected]> danginsburg <[email protected]>
Colin Buchanan <[email protected]> colinbuchanan <[email protected]>
Gavin Cooper <[email protected]> gjcooper <[email protected]>
Hans Johnson <[email protected]> Hans Johnson <[email protected]>
Hans Johnson <[email protected]> hjmjohnson <[email protected]>
Horea Christian <[email protected]> Horea Christian <[email protected]>
Isaac Schwabacher <[email protected]> ischwabacher <[email protected]>
James Kent <[email protected]> jdkent <[email protected]>
Jason Wong <[email protected]> Jason <[email protected]>
Jason Wong <[email protected]> jason <[email protected]>
Jason Wong <[email protected]> Jason W <[email protected]>
Jason Wong <[email protected]> Jason W <[email protected]>
Jason Wong <[email protected]> jason-wg <[email protected]>
Jens Kleesiek <[email protected]> JensNRAD <[email protected]>
Joerg Stadler <[email protected]> Joerg Stadler <[email protected]>
Joerg Stadler <[email protected]> Jörg Stadler <[email protected]>
Joke Durnez <[email protected]> jokedurnez <[email protected]>
Josh Warner <[email protected]> Josh Warner (Mac) <[email protected]>
Kai Schlamp <[email protected]> medihack <[email protected]>Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
Leonie Lampe <[email protected]> Leonie Lmape <[email protected]>
Mathias Goncalves <[email protected]> mathiasg <[email protected]>
Michael Dayan <[email protected]> Michael <[email protected]>
Michael Dayan <[email protected]> Michael <[email protected]>
Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
Michael Clark <[email protected]> Clark <[email protected]>
Michael Notter <[email protected]> miykael <[email protected]>
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
Michael Waskom <[email protected]> mwaskom <[email protected]>
Michael Waskom <[email protected]> mwaskom <[email protected]>
Oscar Esteban <[email protected]> Oscar Esteban <code@oscaresteban>
Oscar Esteban <[email protected]> oesteban <[email protected]>
Russell Poldrack <[email protected]> Russ Poldrack <[email protected]>
Russell Poldrack <[email protected]> poldrack <[email protected]>
Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
Shariq Iqbal <[email protected]> shariqiqbal2810 <[email protected]>
Shariq Iqbal <[email protected]> shariqiqbal2810 <[email protected]>
Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
Shoshana Berleant <[email protected]> Shoshana Berleant <[email protected]>
Simon R <[email protected]> Simon Rothmeier <[email protected]>
Siqi Liu <[email protected]> siqi liu <[email protected]>
Siqi Liu <[email protected]> sql <[email protected]>
Steven Giavasis <[email protected]> Steven Giavasis <[email protected]>
Steven Giavasis <[email protected]> sgiavasis <[email protected]>
Steven Giavasis <[email protected]> sgiavasis <[email protected]>
Tristan Glatard <[email protected]> Tristan Glatard <[email protected]>
Victor Saase <[email protected]> vsaase <[email protected]>
William Triplett <[email protected]> William Triplett <[email protected]>
Yaroslav Halchenko <[email protected]> Yaroslav Halchenko <[email protected]>
pipolose <[email protected]> pipolose <[email protected]>
Loading