Merge branch 'fmriprep' into fmriprep

incf-nidash · Jun 4, 2024 · c10bf10 · c10bf10
2 parents 9b55891 + eb0fa56
commit c10bf10
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
  fetch-depth: 0
 
  - name: Set up Python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: '^3.8'
 

diff --git a/.github/workflows/pythontest.yml b/.github/workflows/pythontest.yml
@@ -19,7 +19,7 @@ jobs:
  fetch-depth: 0
 
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
 
  - name: Set up Python
  if: steps.auto-version.outputs.version != ''
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
  with:
  python-version: '^3.8'
 

diff --git a/src/nidm/experiment/tools/csv2nidm.py b/src/nidm/experiment/tools/csv2nidm.py
@@ -485,7 +485,7 @@ def main():
  # f.write(project.serializeTurtle())
 
  id_field = detect_idfield(column_to_terms)
-
+ 
  # if we couldn't find a subject ID field in column_to_terms, ask user
  if id_field is None:
  # ask user for id field