Skip to content

REL: 1.3.0-rc1 #3069

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.

Sign up for GitHub

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 8 commits into from
Oct 8, 2019
Merged

REL: 1.3.0-rc1 #3069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a712425
DOC: Update changelog
effigies Oct 7, 2019
040b942
MNT: Version 1.3.0-rc1
effigies Oct 7, 2019
215349b
CI: Use Python 3.6.5 environment for packaging
effigies Oct 7, 2019
50952d7
MNT: Update mailmap, tracking down ambiguous authors
effigies Oct 8, 2019
a0ee11c
FIX: Always propagate existing Zenodo authors
effigies Oct 8, 2019
21ef45e
DOC: Update .zenodo.json ordering
effigies Oct 8, 2019
b417e47
DOC: Add Olivia Stanley to Zenodo
effigies Oct 8, 2019
f35d7a7
DOC: Restore Zenodo entries that have been dropped over time
effigies Oct 8, 2019
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
4 changes: 3 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ jobs:
- run:
name: Check pypi preconditions
command: |
pyenv local 3.6.5
pip install --upgrade pip twine future wheel readme_renderer setuptools
python setup.py sdist bdist_wheel
twine check dist/*
Expand All @@ -353,7 +354,7 @@ jobs:
- run:
name: Validate Python 3 installation
command: |
pyenv local 3.5.2
pyenv local 3.6.5
pip install --upgrade pip
pip install dist/nipype-*-py2.py3-none-any.whl
# Futures should not install in Python 3
Expand Down Expand Up @@ -388,6 +389,7 @@ jobs:
- run:
name: Deploy to PyPI
command: |
pyenv local 3.6.5
pip install --upgrade twine future wheel readme_renderer setuptools
python setup.py check -r -s
python setup.py sdist bdist_wheel
Expand Down
3 changes: 3 additions & 0 deletions .mailmap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Horea Christian <horea.christ@yandex.com> <h.chr@mail.ru>
Isaac Schwabacher <ischwabacher@wisc.edu>
Jakub Kaczmarzyk <jakubk@mit.edu>
James Kent <james-kent@uiowa.edu>
James Kent <james-kent@uiowa.edu> Fred Mertz <mertzf@bargle.argle>
Janosch Linkersdörfer <linkersdoerfer@gmail.com>
Jason Wong <jf126dolphin@gmail.com>
Jason Wong <jf126dolphin@gmail.com> <jasonwong73@ucla.edu>
Expand All @@ -80,6 +81,7 @@ Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <joerg.stadler@lin-magdeburg.de>
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <jstadler@ilin-magdeburg.de>
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <Stadler@lin-magdeburg.de>
John A. Lee <johnleenimh@gmail.com>
John A. Lee <johnleenimh@gmail.com> <leej3@users.noreply.github.com>
Joke Durnez <joke.durnez@gmail.com>
Josh Warner <silvertrumpet999+github@gmail.com> <warner.joshua@mayo.edu>
Junhao WEN <anbai106@hotmail.com>
Expand Down Expand Up @@ -151,6 +153,7 @@ Shariq Iqbal <shariqiqbal2810@gmail.com>
Shariq Iqbal <shariqiqbal2810@gmail.com> <shariqiqbal2810@users.noreply.github.com>
Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
Shoshana Berleant <berleant@stanford.edu> <shoshber@users.noreply.github.com>
Shoshana Berleant <berleant@stanford.edu> Ubuntu <ubuntu@ip-172-31-43-202.us-west-2.compute.internal>
Simon Rothmei <srothmei@mailbox.tu-berlin.de>
Simon Rothmei <srothmei@mailbox.tu-berlin.de> <srothmei@users.noreply.github.com>
Siqi Liu <lsqshr@gmail.com>
Expand Down
Loading