From 94db50f02379bfaa610971d062bb90c5fdf0cb66 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Wed, 24 Jan 2018 11:21:10 -0500 Subject: [PATCH 1/2] rel: 1.0.0 --- CHANGES | 6 +++++- doc/conf.py | 2 +- doc/documentation.rst | 2 +- nipype/info.py | 2 +- nipype/pipeline/plugins/pbs.py | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index bc9d19077e..ccd69506c3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,7 @@ -Upcoming release (1.0.0) +Upcoming release +================ + +1.0.0 (January 24, 2018) ======================== * FIX: PBS plugin submissions (https://github.com/nipy/nipype/pull/2344) @@ -22,6 +25,7 @@ Upcoming release (1.0.0) * STY: Cleanup of PEP8 violations (https://github.com/nipy/nipype/pull/2358) * STY: Cleanup of trailing spaces and adding of missing newlines at end of files (https://github.com/nipy/nipype/pull/2355) * STY: Apply yapf to codebase (https://github.com/nipy/nipype/pull/2371) +* DOC: Updated guide for contributing (https://github.com/nipy/nipype/pull/2393) 0.14.0 (November 29, 2017) ========================== diff --git a/doc/conf.py b/doc/conf.py index 094a8250aa..9891454e6c 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 = "0.14.0" +release = "1.0.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/documentation.rst b/doc/documentation.rst index f8a2b6d642..82436fc812 100644 --- a/doc/documentation.rst +++ b/doc/documentation.rst @@ -9,7 +9,7 @@ Documentation :Release: |version| :Date: |today| -Previous versions: `0.13.1 `_ `0.12.1 `_ +Previous versions: `0.14.0 `_ `0.13.1 `_ .. container:: doc2 diff --git a/nipype/info.py b/nipype/info.py index 884926f46d..5b9e47b7cb 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__ = '0.14.1-dev' +__version__ = '1.0.0' def get_nipype_gitversion(): diff --git a/nipype/pipeline/plugins/pbs.py b/nipype/pipeline/plugins/pbs.py index 437c901a00..7808e52156 100644 --- a/nipype/pipeline/plugins/pbs.py +++ b/nipype/pipeline/plugins/pbs.py @@ -57,9 +57,9 @@ def _is_pending(self, taskid): stdout = result.runtime.stdout stderr = result.runtime.stderr - errmsg = 'Unknown Job Id' + errmsg = 'Unknown Job Id' success = 'Job has finished' - if (success in stderr) or ('job_state = C' in stdout): + if (success in stderr) or ('job_state = C' in stdout): return False else: return errmsg not in stderr From 10694b8777f0452edcde24abba016f6ff8a17549 Mon Sep 17 00:00:00 2001 From: mathiasg Date: Wed, 24 Jan 2018 12:19:51 -0500 Subject: [PATCH 2/2] fix: changelog [skip ci] --- CHANGES | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index ccd69506c3..2b343cd455 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,8 @@ -Upcoming release -================ - 1.0.0 (January 24, 2018) ======================== +###### [Full changelog](https://github.com/nipy/nipype/milestone/16?closed=1) + * FIX: PBS plugin submissions (https://github.com/nipy/nipype/pull/2344) * FIX: Graph plugins submissions (https://github.com/nipy/nipype/pull/2359) * FIX: Logging error if % in interface command (https://github.com/nipy/nipype/pull/2364)