Merge pull request #29 from lincbrain/ak-ci

Alter imports for linc-archive <> CLI integration tests
lincbrain · Jan 31, 2024 · 5121624 · 5121624
2 parents bd598c5 + 6665d2c
commit 5121624
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,12 +1,17 @@
 name: Tests
 
+#on:
+#  push:
+#    branches:
+#      - master
+#  pull_request:
+#  schedule:
+#    - cron: '0 6 * * *'
+
+
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-  schedule:
-    - cron: '0 6 * * *'
+  - push
+  - pull_request
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name }}
@@ -105,20 +110,20 @@ jobs:
     - name: Run Dandi API tests only
       if: matrix.mode == 'dandi-api'
       run: |
-        python -m pytest -s -v --cov=dandi --cov-report=xml --dandi-api dandi
+        python -m pytest -s -v --cov=dandi --cov-report=xml --dandi-api lincbrain
 
     - name: Dump Docker Compose logs
       if: failure() && startsWith(matrix.os, 'ubuntu')
       run: |
         docker-compose \
-          -f dandi/tests/data/dandiarchive-docker/docker-compose.yml \
+          -f lincbrain/tests/data/dandiarchive-docker/docker-compose.yml \
           logs --timestamps
 
     - name: Shut down Docker Compose
       if: startsWith(matrix.os, 'ubuntu')
       run: |
         docker-compose \
-          -f dandi/tests/data/dandiarchive-docker/docker-compose.yml \
+          -f lincbrain/tests/data/dandiarchive-docker/docker-compose.yml \
           down -v
 
     - name: Upload coverage to Codecov

diff --git a/lincbrain/cli/tests/test_service_scripts.py b/lincbrain/cli/tests/test_service_scripts.py
@@ -13,7 +13,7 @@
 import pytest
 import vcr
 
-from dandi import __version__
+from lincbrain import __version__
 from lincbrain.tests.fixtures import SampleDandiset
 
 from ..cmd_service_scripts import service_scripts

diff --git a/lincbrain/tests/test_dandiarchive.py b/lincbrain/tests/test_dandiarchive.py
@@ -3,8 +3,8 @@
 import pytest
 import responses
 
-from dandi.consts import DandiInstance, known_instances
-from dandi.dandiarchive import (
+from lincbrain.consts import DandiInstance, known_instances
+from lincbrain.dandiarchive import (
     AssetFolderURL,
     AssetGlobURL,
     AssetIDURL,
@@ -17,8 +17,8 @@
     multiasset_target,
     parse_dandi_url,
 )
-from dandi.exceptions import NotFoundError, UnknownURLError
-from dandi.tests.skip import mark
+from lincbrain.exceptions import NotFoundError, UnknownURLError
+from lincbrain.tests.skip import mark
 
 from .fixtures import DandiAPI, SampleDandiset