FIX: Update CI workflow for Docker Compose v2 (pyxnat#195)

* FIX: Update CI workflow for Docker Compose v2 * FIX: replace subject removed from NITRC XNAT
jhuguetn · Feb 3, 2025 · f725c1f · f725c1f
1 parent d8f2583
commit f725c1f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,18 +30,18 @@ jobs:
           repository: NrgXnat/xnat-docker-compose
           ref: 1.8.1
           path: xnat-docker-compose
-      - run: docker-compose --version
+      - run: docker compose version
       - run: python --version
       - run: python -m pip install --upgrade pip
       - name: Install dependencies
         run: pip install -r requirements-dev.txt
       - name: Start xnat-docker-compose
-        run: docker-compose up -d
+        run: docker compose up -d
         working-directory: xnat-docker-compose
       - run: sleep 120
         if: ${{ matrix.python-version == '3.8' }}
       - name: Check xnat-docker-compose
-        run: docker-compose logs --tail=20 xnat-web
+        run: docker compose logs --tail=20 xnat-web
         working-directory: xnat-docker-compose
       - name: create config json (Central/NITRC)
         id: create-json-central

diff --git a/pyxnat/tests/array_test.py b/pyxnat/tests/array_test.py
@@ -18,8 +18,8 @@ def test_array_experiments(self):
         of experiments (i.e. MRSessions and PETSessions) and assert it gathers
         them all.
         '''
-        e = self._intf.array.experiments(subject_id='XNAT_S04207').data
-        self.assertEqual(len(e), 2)
+        e = self._intf.array.experiments(subject_id='xnat_S02636').data
+        self.assertEqual(len(e), 1)
 
     @skip_if_no_network
     def test_array_mrsessions(self):
@@ -28,8 +28,8 @@ def test_array_mrsessions(self):
         list of MRI sessions and assert its length matches the list of
         experiments of type 'xnat:mrSessionData'
         '''
-        mris = self._intf.array.mrsessions(subject_id='XNAT_S04207').data
-        e = self._intf.array.experiments(subject_id='XNAT_S04207',
+        mris = self._intf.array.mrsessions(subject_id='xnat_S02636').data
+        e = self._intf.array.experiments(subject_id='xnat_S02636',
                                          experiment_type='xnat:mrSessionData')
         exps = e.data
         self.assertListEqual(mris, exps)