diff --git a/doc/changelog/1.X.X-changelog b/doc/changelog/1.X.X-changelog index a085d5e642..1914257bf6 100644 --- a/doc/changelog/1.X.X-changelog +++ b/doc/changelog/1.X.X-changelog @@ -1,3 +1,14 @@ +1.1.5 (November 08, 2018) +========================= + +Hotfix release. + +##### [Full changelog](https://github.com/nipy/nipype/milestone/26?closed=1) + + * ENH: Allow timeouts during SLURM job status checks (https://github.com/nipy/nipype/pull/2767) + * RF: Subclass non-daemon variants of all multiprocessing contexts (https://github.com/nipy/nipype/pull/2771) + + 1.1.4 (October 31, 2018) ======================== diff --git a/doc/conf.py b/doc/conf.py index c88feb1892..2f96c9c6ae 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -82,7 +82,7 @@ # The short X.Y version. version = nipype.__version__ # The full version, including alpha/beta/rc tags. -release = "1.1.4" +release = "1.1.5" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/nipype/info.py b/nipype/info.py index b6e147d266..f2a04a7bea 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -11,7 +11,7 @@ # full release. '.dev' as a version_extra string means this is a development # version # Remove -dev for release -__version__ = '1.1.5-dev' +__version__ = '1.1.5' def get_nipype_gitversion():