Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 12f7023

Browse files
authored
Merge branch 'master' into fix/merge_rois_zero_d_array
2 parents 2c8017d + fe20d45 commit 12f7023

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+184
-120
lines changed

‎.git-blame-ignore-revs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Fri Feb 21 14:06:53 2025 -0500 - markiewicz@stanford.edu - sty: black [ignore-rev]
2+
8ed2b2306aeb7d89de4958b5293223ffe27a4f34
3+
# Tue Apr 13 10:16:17 2021 -0400 - markiewicz@stanford.edu - STY: black
4+
b1690d5beb391e08c1e5463f1e3c641cf1e9f58e
15
# Thu Oct 31 10:01:38 2024 -0400 - effigies@gmail.com - STY: black [ignore-rev]
26
bd0d5856d183ba3918eda31f80db3b1d4387c55c
37
# Thu Mar 21 13:34:09 2024 -0400 - effigies@gmail.com - STY: black [ignore-rev]

‎nipype/caching/tests/test_memory.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
""" Test the nipype interface caching mechanism
2-
"""
1+
"""Test the nipype interface caching mechanism"""
32

43
from .. import Memory
54
from ...pipeline.engine.tests.test_engine import EngineTestInterface

‎nipype/external/cloghandler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
12-
"""cloghandler.py: A smart replacement for the standard RotatingFileHandler
12+
"""cloghandler.py: A smart replacement for the standard RotatingFileHandler
1313
1414
ConcurrentRotatingFileHandler: This class is a log handler which is a drop-in
1515
replacement for the python standard log handler 'RotateFileHandler', the primary

‎nipype/info.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""This file contains defines parameters for nipy that we use to fill
1+
"""This file contains defines parameters for nipy that we use to fill
22
settings in setup.py, the nipy top-level docstring, and for building the
33
docs. In setup.py in particular, we exec this file, so it cannot import nipy
44
"""
@@ -149,6 +149,7 @@ def get_nipype_gitversion():
149149
"acres",
150150
"etelemetry>=0.3.1",
151151
"looseversion!=1.2",
152+
"gputil>=1.4.0",
152153
"puremagic",
153154
]
154155

‎nipype/interfaces/ants/registration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""The ants module provides basic functions for interfacing with ants
2-
functions.
2+
functions.
33
"""
44

55
import os

‎nipype/interfaces/ants/resampling.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""ANTS Apply Transforms interface
2-
"""
1+
"""ANTS Apply Transforms interface"""
32

43
import os
54

‎nipype/interfaces/ants/visualization.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""The ants visualisation module provides basic functions based on ITK.
2-
"""
1+
"""The ants visualisation module provides basic functions based on ITK."""
32

43
import os
54

‎nipype/interfaces/bru2nii.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""The bru2nii module provides basic functions for dicom conversion
2-
"""
1+
"""The bru2nii module provides basic functions for dicom conversion"""
32

43
import os
54
from .base import (

‎nipype/interfaces/camino/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
22
# vi: set ft=python sts=4 ts=4 sw=4 et:
3-
"""Camino top level namespace
4-
"""
3+
"""Camino top level namespace"""
54

65
from .connectivity import Conmat
76
from .convert import (

‎nipype/interfaces/cmtk/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
22
# vi: set ft=python sts=4 ts=4 sw=4 et:
3-
"""Base interface for cmtk"""
3+
"""Base interface for cmtk"""
44

55
from ..base import LibraryBaseInterface
66
from ...utils.misc import package_check

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /