From 2fa1e79c22902f4c072ff5e64964c3c5034659a0 Mon Sep 17 00:00:00 2001 From: Aaron Kanzer Date: Wed, 31 Jan 2024 13:32:45 -0500 Subject: [PATCH 1/3] Look into CLI test failures via GHA --- .github/workflows/test.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index da8b48eb0..51d72a000 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,12 +1,14 @@ name: Tests -on: - push: - branches: - - master - pull_request: - schedule: - - cron: '0 6 * * *' +#on: +# push: +# branches: +# - master +# pull_request: +# schedule: +# - cron: '0 6 * * *' + +on: push concurrency: group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name }} From b766ee86cc096344593bcad0d5b72902d4a9d7e5 Mon Sep 17 00:00:00 2001 From: Aaron Kanzer Date: Wed, 31 Jan 2024 13:35:27 -0500 Subject: [PATCH 2/3] update rules --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 51d72a000..823b57642 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,10 @@ name: Tests # schedule: # - cron: '0 6 * * *' -on: push + +on: + - push + - pull_request concurrency: group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name }} From 6665d2c6ba543b80c8b9b3d2545f92acb383d6eb Mon Sep 17 00:00:00 2001 From: Aaron Kanzer Date: Wed, 31 Jan 2024 15:43:23 -0500 Subject: [PATCH 3/3] Alter imports for linc-archive tests --- .github/workflows/test.yml | 6 +++--- lincbrain/cli/tests/test_service_scripts.py | 2 +- lincbrain/tests/test_dandiarchive.py | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 823b57642..8ee1659b4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -110,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 index e5084118f..d779baea4 100644 --- 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 index 690fda63f..543701181 100644 --- 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