fix: miscellaneous fixes

- [x] update HCP's boldref images with brain-extracted versions
- [x] Clear up circle caches to take up the new data
- [x] Minor workflow name change

.circleci/config.yml

@@ -72,9 +72,9 @@ jobs:
     steps:
       - restore_cache:
           keys:
-            - data-v0-{{ .Branch }}-
-            - data-v0-master-
-            - data-v0-
+            - data-v1-{{ .Branch }}-
+            - data-v1-master-
+            - data-v1-
       - run:
           name: Setup git-annex
           command: |
@@ -128,7 +128,7 @@ jobs:
             echo "crashfile_format = txt" >> /tmp/data/nipype.cfg
 
       - save_cache:
-         key: data-v0-{{ .Branch }}-{{ .BuildNum }}
+         key: data-v1-{{ .Branch }}-{{ .BuildNum }}
          paths:
             - "/opt/circleci/.pyenv/versions/3.5.2"
             - /tmp/data
@@ -150,9 +150,9 @@ jobs:
           path: /tmp/src/sdcflows
       - restore_cache:
           keys:
-            - workdir-v0-{{ .Branch }}-
-            - workdir-v0-master-
-            - workdir-v0-
+            - workdir-v1-{{ .Branch }}-
+            - workdir-v1-master-
+            - workdir-v1-
       - run:
           name: Load Docker image layer cache
           no_output_timeout: 30m
@@ -175,7 +175,7 @@ jobs:
                    -v /tmp/data/nipype.cfg:/home/sdcflows/.nipype/nipype.cfg \
                    -v /tmp/data:/data:ro -v /tmp/src:/src -v /tmp/tests:/out \
                    -w /work poldracklab/sdcflows:latest \
-                   pytest -n auto -v --junit-xml=/out/pytest.xml /src/sdcflows/sdcflows
+                   pytest -v --junit-xml=/out/pytest.xml /src/sdcflows/sdcflows
 
       - store_artifacts:
           path: /tmp/tests
@@ -184,7 +184,7 @@ jobs:
       - store_test_results:
           path: /tmp/tests
       - save_cache:
-         key: workdir-v0-{{ .Branch }}-{{ .BuildNum }}
+         key: workdir-v1-{{ .Branch }}-{{ .BuildNum }}
          paths:
             - /tmp/work
 

sdcflows/workflows/pepolar.py

@@ -115,7 +115,7 @@ def init_pepolar_unwarp_wf(omp_nthreads=1, matched_pe=False,
 
     prepare_epi_wf = init_prepare_epi_wf(omp_nthreads=omp_nthreads,
                                          matched_pe=matched_pe,
-                                         name="prepare_epi_opposite_wf")
+                                         name="prepare_epi_wf")
 
     qwarp = pe.Node(afni.QwarpPlusMinus(
         pblur=[0.05, 0.05], blur=[-1, -1], noweight=True, minpatch=9, nopadWARP=True,

sdcflows/workflows/tests/test_pepolar.py

@@ -118,7 +118,7 @@ def test_pepolar_wf1(bids_layouts, output_path, dataset, workdir):
     if dataset == 'testdata':
         bold = layout.get(suffix='bold', dir='LR', direction='LR',
                           extension=['.nii.gz', '.nii'])[0]
-        boldref = layout.get(suffix='boldref', dir='LR', direction='LR',
+        boldref = layout.get(suffix='boldref', dir='LR', direction='LR', desc='brain',
                              extension=['.nii.gz', '.nii'])[0]
     elif dataset == 'ds001600':
         bold = layout.get(suffix='bold', acquisition='AP',