Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

Alter imports for linc-archive <> CLI integration tests #29

Merged
merged 3 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lincbrain/cli/tests/test_service_scripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions lincbrain/tests/test_dandiarchive.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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

Expand Down
Loading