Thanks to visit codestin.com
Credit goes to github.com

Skip to content

REL: 1.6.1 #3336

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 9 commits into from
Jun 16, 2021
Merged

REL: 1.6.1 #3336

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6e3387d
MNT: 1.6.1
effigies May 26, 2021
05adb41
MNT: Update mailmap
effigies May 26, 2021
5ef61f8
MNT: Update Zenodo ordering
effigies May 26, 2021
b333b13
DOC: 1.6.1 changelog
effigies May 26, 2021
77f7659
DOC: Update previous releases in interfaces.rst
effigies May 26, 2021
ba8ac9c
Squashed commit of the following:
effigies May 27, 2021
9745ebd
MNT: Clean up deprecations
effigies May 30, 2021
da278a6
MNT: np.bool -> bool
effigies May 30, 2021
9fd9785
MNT: Drop invalid "is not" usage
effigies May 30, 2021
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
Prev Previous commit
Next Next commit
MNT: Clean up deprecations
  • Loading branch information
@effigies
effigies committed Jun 16, 2021
commit 9745ebdd96ed3b6c3750aa1a5fbd3aae96aa67b8
2 changes: 1 addition & 1 deletion nipype/interfaces/base/traits_extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
(usually by Robert Kern).

"""
from collections import Sequence
from collections.abc import Sequence

# perform all external trait imports here
from traits import __version__ as traits_version
Expand Down
4 changes: 2 additions & 2 deletions nipype/utils/misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import os
import sys
import re
from collections import Iterator
from collections.abc import Iterator
from warnings import warn

from distutils.version import LooseVersion
Expand Down Expand Up @@ -34,7 +34,7 @@ def atoi(text):
def natural_keys(text):
if isinstance(text, tuple):
text = text[0]
return [atoi(c) for c in re.split("(\d+)", text)]
return [atoi(c) for c in re.split(r"(\d+)", text)]

return sorted(l, key=natural_keys)

Expand Down