Skip to content

Commit c8091cc

Browse files
effigieseffigies
authored
Merge pull request #2589 from nipy/rel/1.0.4
REL: 1.0.4
2 parents a882e74 + 868a903 commit c8091cc

File tree

11 files changed

+235
-32
lines changed

11 files changed

+235
-32
lines changed

‎.circleci/config.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,38 @@ jobs:
343343
python setup.py sdist bdist_wheel
344344
twine upload dist/*
345345
346+
update_feedstock:
347+
machine: *machine_kwds
348+
working_directory: /home/circleci/nipype
349+
steps:
350+
- checkout:
351+
path: /home/circleci/nipype
352+
- run:
353+
name: Install hub
354+
command: |
355+
curl -sSL https://github.com/github/hub/releases/download/v2.2.9/hub-linux-amd64-2.2.9.tgz | \
356+
tar zxv -C /tmp
357+
sudo /tmp/hub-linux-amd64-2.2.9/install
358+
- run:
359+
name: Expand SSH Key
360+
command: |
361+
(echo "-----BEGIN OPENSSH PRIVATE KEY-----";
362+
echo $GITHUB_ED25519 | fold -w 71;
363+
echo "-----END OPENSSH PRIVATE KEY-----") > ~/.ssh/id_ed25519
364+
chmod go-rwx ~/.ssh/id_ed25519
365+
ssh-keygen -y -f ~/.ssh/id_ed25519 > ~/.ssh/id_ed25519.pub
366+
- run:
367+
name: Set git identity
368+
command: |
369+
git config --global user.name "nipybot"
370+
git config --global user.email "nipybot@gmail.com"
371+
- run:
372+
name: Update feedstock
373+
command: |
374+
ssh-add -D
375+
ssh-add ~/.ssh/id_ed25519
376+
/home/circleci/nipype/tools/feedstock.sh
377+
346378
workflows:
347379
version: 2
348380
build_test_deploy:
@@ -380,3 +412,10 @@ workflows:
380412
- test_fmri_spm_nested_fsl_feeds
381413
- test_py3_fmri_fsl_spm
382414
- test_py3_fmri_spm_dartel_multiproc
415+
- update_feedstock:
416+
context: nipybot
417+
filters:
418+
branches:
419+
only: /rel\/.*/
420+
tags:
421+
only: /.*/

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ __pycache__/
2828
.*.swp
2929
.ipynb_checkpoints/
3030
.ruby-version
31+
.pytest_cache

‎.zenodo.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
"name": "Esteban, Oscar",
1111
"orcid": "0000-0001-8435-6191"
1212
},
13-
{
14-
"affiliation": "Independent",
15-
"name": "Ziegler, Erik",
16-
"orcid": "0000-0003-1857-8129"
17-
},
1813
{
1914
"affiliation": "Stanford University",
2015
"name": "Markiewicz, Christopher J.",
2116
"orcid": "0000-0002-6533-164X"
2217
},
18+
{
19+
"affiliation": "Independent",
20+
"name": "Ziegler, Erik",
21+
"orcid": "0000-0003-1857-8129"
22+
},
2323
{
2424
"affiliation": "The University of Iowa",
2525
"name": "Ellis, David Gage",
@@ -65,15 +65,15 @@
6565
"name": "Jordan, Kesshi",
6666
"orcid": "0000-0001-6313-0580"
6767
},
68-
{
69-
"affiliation": "Department of Psychology, Stanford University",
70-
"name": "Waskom, Michael"
71-
},
7268
{
7369
"affiliation": "MIT",
7470
"name": "Goncalves, Mathias",
7571
"orcid": "0000-0002-7252-7771"
7672
},
73+
{
74+
"affiliation": "Department of Psychology, Stanford University",
75+
"name": "Waskom, Michael"
76+
},
7777
{
7878
"affiliation": "Developer",
7979
"name": "Clark, Daniel",
@@ -97,6 +97,11 @@
9797
{
9898
"name": "Madison, Cindee"
9999
},
100+
{
101+
"affiliation": "Dartmouth College",
102+
"name": "Visconti di Oleggio Castello, Matteo",
103+
"orcid": "0000-0001-7931-5272"
104+
},
100105
{
101106
"affiliation": "National Institutes of Health",
102107
"name": "Clark, Michael G. "
@@ -116,11 +121,6 @@
116121
"name": "Keshavan, Anisha",
117122
"orcid": "0000-0003-3554-043X"
118123
},
119-
{
120-
"affiliation": "Dartmouth College",
121-
"name": "Visconti di Oleggio Castello, Matteo",
122-
"orcid": "0000-0001-7931-5272"
123-
},
124124
{
125125
"name": "Pinsard, Basile"
126126
},
@@ -137,6 +137,10 @@
137137
"name": "Nielson, Dylan M.",
138138
"orcid": "0000-0003-4613-6643"
139139
},
140+
{
141+
"affiliation": "Molecular Imaging Research Center, CEA, France",
142+
"name": "Bougacha, Salma"
143+
},
140144
{
141145
"affiliation": "INRIA",
142146
"name": "Varoquaux, Gael",
@@ -160,10 +164,6 @@
160164
{
161165
"name": "Moloney, Brendan"
162166
},
163-
{
164-
"affiliation": "Molecular Imaging Research Center, CEA, France",
165-
"name": "Bougacha, Salma"
166-
},
167167
{
168168
"affiliation": "Dartmouth College: Hanover, NH, United States",
169169
"name": "Halchenko, Yaroslav O.",
@@ -218,11 +218,6 @@
218218
"name": "Pauli, Wolfgang M.",
219219
"orcid": "0000-0002-0966-0254"
220220
},
221-
{
222-
"affiliation": "University College London",
223-
"name": "Mancini, Matteo",
224-
"orcid": "0000-0001-7194-4568"
225-
},
226221
{
227222
"affiliation": "Duke University",
228223
"name": "Iqbal, Shariq",
@@ -232,6 +227,11 @@
232227
"affiliation": "Nathan s Kline institute for psychiatric research",
233228
"name": "Sikka, Sharad"
234229
},
230+
{
231+
"affiliation": "University College London",
232+
"name": "Mancini, Matteo",
233+
"orcid": "0000-0001-7194-4568"
234+
},
235235
{
236236
"name": "Schwartz, Yannick"
237237
},
@@ -381,6 +381,11 @@
381381
{
382382
"name": "Hallquist, Michael"
383383
},
384+
{
385+
"affiliation": "Donders Institute for Brain, Cognition and Behavior, Center for Cognitive Neuroimaging",
386+
"name": "Chetverikov, Andrey",
387+
"orcid": "0000-0003-2767-6310"
388+
},
384389
{
385390
"name": "Salvatore, John"
386391
},
@@ -395,11 +400,6 @@
395400
"name": "Craddock, R. Cameron",
396401
"orcid": "0000-0002-4950-1303"
397402
},
398-
{
399-
"affiliation": "Donders Institute for Brain, Cognition and Behavior, Center for Cognitive Neuroimaging",
400-
"name": "Chetverikov, Andrey",
401-
"orcid": "0000-0003-2767-6310"
402-
},
403403
{
404404
"name": "Inati, Souheil"
405405
},
@@ -587,4 +587,4 @@
587587
],
588588
"license": "Apache-2.0",
589589
"upload_type": "software"
590-
}
590+
}

‎doc/changelog/1.X.X-changelog‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
1.0.4 (May 29, 2018)
2+
====================
3+
4+
###### [Full changelog](https://github.com/nipy/nipype/milestone/20?closed=1)
5+
6+
* FIX: Update logging levels in enable_debug_mode (https://github.com/nipy/nipype/pull/2595)
7+
* FIX: Set default result in DistributedPluginBase._clean_queue (https://github.com/nipy/nipype/pull/2596)
8+
* FIX: Correctly connect JoinNodes in nested iterables (https://github.com/nipy/nipype/pull/2597)
9+
* FIX: DTITK nonlinear workflow origin reslicing (https://github.com/nipy/nipype/pull/2561)
10+
* FIX: ResponseSD support for multiple b-vals (https://github.com/nipy/nipype/pull/2582)
11+
* FIX: Workaround to ICA-AROMA change of directory (https://github.com/nipy/nipype/pull/2566)
12+
* FIX/TEST: Gunzip cleanup and test (https://github.com/nipy/nipype/pull/2564)
13+
* FIX: Print UID in crashfile if login name is unavailable (https://github.com/nipy/nipype/pull/2563)
14+
* ENH: initial connectome workbench support (https://github.com/nipy/nipype/pull/2594)
15+
* ENH: AFNI (3d)LocalBistat interface (https://github.com/nipy/nipype/pull/2590)
16+
* ENH: Reorient interface (https://github.com/nipy/nipype/pull/2572)
17+
* ENH: FSL slice interface (https://github.com/nipy/nipype/pull/2585)
18+
* ENH: LabelGeometryMeasures interface (https://github.com/nipy/nipype/pull/2586)
19+
* ENH: MRTrix3 dwidenoise interface (https://github.com/nipy/nipype/pull/2568)
20+
* ENH: ReportCapableInterface mix-in/base interface (https://github.com/nipy/nipype/pull/2560)
21+
* CI: Move PyPI deployment to Circle (https://github.com/nipy/nipype/pull/2587)
22+
* CI: Submit Travis results to codecov (https://github.com/nipy/nipype/pull/2574)
23+
124
1.0.3 (April 30, 2018)
225
======================
326

‎doc/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
# The short X.Y version.
8383
version = nipype.__version__
8484
# The full version, including alpha/beta/rc tags.
85-
release = "1.0.3"
85+
release = "1.0.4"
8686

8787
# The language for content autogenerated by Sphinx. Refer to documentation
8888
# for a list of supported languages.

‎doc/documentation.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Documentation
99
:Release: |version|
1010
:Date: |today|
1111

12-
Previous versions: `0.14.0 <http://nipype.readthedocs.io/en/v0.14.0/>`_ `0.13.1 <http://nipype.readthedocs.io/en/0.13.1/>`_
12+
Previous versions: `1.0.3 <http://nipype.readthedocs.io/en/1.0.3/>`_ `1.0.2 <http://nipype.readthedocs.io/en/1.0.2/>`_
1313

1414

1515
.. container:: doc2

‎nipype/info.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# full release. '.dev' as a version_extra string means this is a development
1212
# version
1313
# Remove -dev for release
14-
__version__ = '1.0.4-dev'
14+
__version__ = '1.0.4'
1515

1616

1717
def get_nipype_gitversion():

‎nipype/interfaces/image.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ class Reorient(SimpleInterface):
7777
[ 0. 0. 1. 0.]
7878
[ 0. 0. 0. 1.]]
7979
80+
.. testcleanup::
81+
82+
>>> import os
83+
>>> os.unlink(res.outputs.out_file)
84+
>>> os.unlink(res.outputs.transform)
85+
8086
"""
8187
input_spec = ReorientInputSpec
8288
output_spec = ReorientOutputSpec

‎nipype/interfaces/mixins/tests/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# -*- coding: utf-8 -*-

‎nipype/interfaces/mixins/tests/test_auto_ReportCapableInterface.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
2+
from __future__ import unicode_literals
3+
from ..reporting import ReportCapableInterface
4+
5+
6+
def test_ReportCapableInterface_inputs():
7+
input_map = dict(
8+
ignore_exception=dict(
9+
deprecated='1.0.0',
10+
nohash=True,
11+
usedefault=True,
12+
), )
13+
inputs = ReportCapableInterface.input_spec()
14+
15+
for key, metadata in list(input_map.items()):
16+
for metakey, value in list(metadata.items()):
17+
assert getattr(inputs.traits()[key], metakey) == value

0 commit comments

Comments
 (0)