Skip to content

rel: 1.0.0 #2399

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 2 commits into from
Jan 25, 2018
Merged

rel: 1.0.0 #2399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94db50f
rel: 1.0.0
mgxd Jan 24, 2018
10694b8
fix: changelog [skip ci]
mgxd Jan 24, 2018
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
5 changes: 4 additions & 1 deletion CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Upcoming release (1.0.0)
1.0.0 (January 24, 2018)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be 25 now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@effigies I've updated it for the official release

========================

###### [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)
Expand All @@ -22,6 +24,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)
==========================
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion doc/documentation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Documentation
:Release: |version|
:Date: |today|

Previous versions: `0.13.1 <http://nipype.readthedocs.io/en/0.13.1/>`_ `0.12.1 <http://nipype.readthedocs.io/en/0.12.1/>`_
Previous versions: `0.14.0 <http://nipype.readthedocs.io/en/v0.14.0/>`_ `0.13.1 <http://nipype.readthedocs.io/en/0.13.1/>`_
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be 0.14.1

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.14.1 became 1.0.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:) i thought we had released 0.14.1 !! now i can understand the slowness of releases.



.. container:: doc2
Expand Down
2 changes: 1 addition & 1 deletion nipype/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
4 changes: 2 additions & 2 deletions nipype/pipeline/plugins/pbs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down