Skip to content

Commit

Permalink
0.10.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisgorgo committed Oct 17, 2014
1 parent 44f7566 commit e63e055
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Next Release
Release 0.10.0 (October 10, 2014)
============

* ENH: New miscelaneous interfaces: SplitROIs (mapper), MergeROIs (reducer)
Expand Down
2 changes: 1 addition & 1 deletion doc/_templates/sidebar_versions.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h3>{{ _('Versions') }}</h3>
<td align="left">Release</td><td align="right">Devel</td>
</tr>
<tr>
<td align="left">0.9.2</td><td align="right">1.0-dev</td>
<td align="left">0.10.0</td><td align="right">1.0-dev</td>
</tr>
<tr>
<td align="left"><a href="{{pathto('users/install')}}">Download</a></td>
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

# General information about the project.
project = u'nipype'
copyright = u'2009-13, Neuroimaging in Python team'
copyright = u'2009-14, Neuroimaging in Python team'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down
2 changes: 1 addition & 1 deletion doc/documentation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Documentation
:Release: |version|
:Date: |today|

Previous versions: `0.8 <http://nipy.org/nipype/0.8>`_ `0.7 <http://nipy.org/nipype/0.7>`_
Previous versions: `0.9.2 <http://nipy.org/nipype/0.9.2>`_ `0.8 <http://nipy.org/nipype/0.8>`_

.. container:: doc2

Expand Down
4 changes: 2 additions & 2 deletions doc/users/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ This page covers the necessary steps to install Nipype.
Download
--------

Release 0.9.2: [`zip <https://github.com/nipy/nipype/archive/0.9.2.zip>`__ `tar.gz
<https://github.com/nipy/nipype/archive/0.9.2.tar.gz>`__]
Release 0.10.0: [`zip <https://github.com/nipy/nipype/archive/0.10.0.zip>`__ `tar.gz
<https://github.com/nipy/nipype/archive/0.10.0.tar.gz>`__]

Development: [`zip <http://github.com/nipy/nipype/zipball/master>`__ `tar.gz
<http://github.com/nipy/nipype/tarball/master>`__]
Expand Down
4 changes: 2 additions & 2 deletions nipype/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# full release. '.dev' as a _version_extra string means this is a development
# version
_version_major = 0
_version_minor = 9
_version_micro = 2
_version_minor = 10
_version_micro = 0
_version_extra = ''

def get_nipype_gitversion():
Expand Down
10 changes: 9 additions & 1 deletion nipype/testing/data/pyscript.m
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
fprintf(1,'Executing %s at %s:\n',mfilename,datestr(now));
ver,
try,a=1;
try,
if isempty(which('spm')),
throw(MException('SPMCheck:NotFound','SPM not in matlab path'));
end;
spm_path = spm('dir');
[name, version] = spm('ver');
fprintf(1, 'NIPYPE path:%s|name:%s|release:%s', spm_path, name, version);
exit;

,catch ME,
fprintf(2,'MATLAB code threw an exception:\n');
fprintf(2,'%s\n',ME.message);
Expand Down

0 comments on commit e63e055

Please sign in to comment.