Commit fd0c566

authored

Merge branch 'master' into update_petsurfer

2 parents 779a4af + 661dd1d commit fd0c566Copy full SHA for fd0c566

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ jobs:`
`14`	`14`
`15`	`15`	`steps:`
`16`	`16`	`- name: Checkout`
`17`		`- uses: actions/checkout@v3`
	`17`	`+ uses: actions/checkout@v4`
`18`	`18`	`- name: Codespell`
`19`	`19`	`uses: codespell-project/actions-codespell@v2`

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ jobs:`
`37`	`37`
`38`	`38`	`runs-on: ubuntu-latest`
`39`	`39`	`steps:`
`40`		`- - uses: actions/checkout@v3`
	`40`	`+ - uses: actions/checkout@v4`
`41`	`41`	`with:`
`42`	`42`	`fetch-depth: 0`
`43`	`43`	`- uses: actions/setup-python@v4`
`@@ -122,7 +122,7 @@ jobs:`
`122`	`122`	`CI_SKIP_TEST: 1`
`123`	`123`
`124`	`124`	`steps:`
`125`		`- - uses: actions/checkout@v3`
	`125`	`+ - uses: actions/checkout@v4`
`126`	`126`	`- name: Set up Python ${{ matrix.python-version }}`
`127`	`127`	`uses: actions/setup-python@v4`
`128`	`128`	`with:`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1491,13 +1491,16 @@ def _list_outputs(self):`
`1491`	`1491`	`filelist = ensure_list(self.inputs.apply_to_files)`
`1492`	`1492`	`for f in filelist:`
`1493`	`1493`	`if isinstance(f, list):`
`1494`		`- run = [fname_presuffix(in_f, prefix="w") for in_f in f]`
	`1494`	`+ run = [`
	`1495`	`+ fname_presuffix(in_f, prefix=self.inputs.out_prefix)`
	`1496`	`+ for in_f in f`
	`1497`	`+ ]`
`1495`	`1498`	`else:`
`1496`		`- run = [fname_presuffix(f, prefix="w")]`
	`1499`	`+ run = [fname_presuffix(f, prefix=self.inputs.out_prefix)]`
`1497`	`1500`	`outputs["normalized_files"].extend(run)`
`1498`	`1501`	`if isdefined(self.inputs.image_to_align):`
`1499`	`1502`	`outputs["normalized_image"] = fname_presuffix(`
`1500`		`- self.inputs.image_to_align, prefix="w"`
	`1503`	`+ self.inputs.image_to_align, prefix=self.inputs.out_prefix`
`1501`	`1504`	`)`
`1502`	`1505`
`1503`	`1506`	`return outputs`

Comments

(0)