Merge branch 'master' into update_petsurfer

nipy · Sep 11, 2023 · fd0c566 · fd0c566
2 parents 779a4af + 661dd1d
commit fd0c566
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -14,6 +14,6 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Codespell
         uses: codespell-project/actions-codespell@v2
diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml
@@ -45,7 +45,7 @@ jobs:
       CI_SKIP_TEST: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -37,7 +37,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v4
@@ -122,7 +122,7 @@ jobs:
       CI_SKIP_TEST: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:

diff --git a/nipype/interfaces/spm/preprocess.py b/nipype/interfaces/spm/preprocess.py
@@ -1491,13 +1491,16 @@ def _list_outputs(self):
                 filelist = ensure_list(self.inputs.apply_to_files)
                 for f in filelist:
                     if isinstance(f, list):
-                        run = [fname_presuffix(in_f, prefix="w") for in_f in f]
+                        run = [
+                            fname_presuffix(in_f, prefix=self.inputs.out_prefix)
+                            for in_f in f
+                        ]
                     else:
-                        run = [fname_presuffix(f, prefix="w")]
+                        run = [fname_presuffix(f, prefix=self.inputs.out_prefix)]
                     outputs["normalized_files"].extend(run)
             if isdefined(self.inputs.image_to_align):
                 outputs["normalized_image"] = fname_presuffix(
-                    self.inputs.image_to_align, prefix="w"
+                    self.inputs.image_to_align, prefix=self.inputs.out_prefix
                 )
 
         return outputs