From ab593cc549150fdb29e97f4f7544083e422452bb Mon Sep 17 00:00:00 2001 From: Lukas Heumos Date: Sat, 28 Dec 2024 19:47:59 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20Isolate=20curator=20tests=20(#23?= =?UTF-8?q?04)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zethson --- .github/workflows/build.yml | 10 +++++----- noxfile.py | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dff6ac264..93d5dd233 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - "faq" - "storage" - "cli" - - "spatial" + - "curator" timeout-minutes: 15 steps: - uses: actions/checkout@v4 @@ -34,12 +34,12 @@ jobs: id: changes with: filters: | - spatial: + curator: - 'lamindb/curators/**' - 'tests/core/test_curator.py' - uses: actions/setup-python@v5 - if: ${{ matrix.group != 'spatial' || steps.changes.outputs.spatial == 'true' }} + if: ${{ matrix.group != 'curator' || steps.changes.outputs.curator == 'true' }} with: python-version: | ${{ matrix.group == 'storage' && '3.9' || @@ -77,14 +77,14 @@ jobs: - run: nox -s lint if: ${{ matrix.group == 'tutorial' }} # choose a fast-running a group - run: nox -s "install_ci(group='${{ matrix.group }}')" - if: ${{ matrix.group != 'spatial' || steps.changes.outputs.spatial == 'true' }} + if: ${{ matrix.group != 'curator' || steps.changes.outputs.curator == 'true' }} - uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - run: nox -s "build(group='${{ matrix.group }}')" - if: ${{ matrix.group != 'spatial' || steps.changes.outputs.spatial == 'true' }} + if: ${{ matrix.group != 'curator' || steps.changes.outputs.curator == 'true' }} - name: upload coverage uses: actions/upload-artifact@v4 diff --git a/noxfile.py b/noxfile.py index 58a17254f..3cf024e58 100644 --- a/noxfile.py +++ b/noxfile.py @@ -121,7 +121,7 @@ def install_ci(session, group): "uv pip install --system --no-deps ./sub/wetlab ./sub/ourprojects", ) run(session, "uv pip install --system vitessce") - elif group == "spatial": + elif group == "curator": extras += "zarr,bionty,jupyter" run( session, @@ -131,6 +131,7 @@ def install_ci(session, group): session, "uv pip install --system -U git+https://github.com/scverse/spatialdata.git@refs/pull/806/head", ) # Required to access metadata attrs + run(session, "uv pip install --system tiledbsoma==1.15.0rc3") elif group == "docs": extras += "bionty,zarr" run( @@ -184,7 +185,7 @@ def build(session, group): if group == "unit-core": run( session, - f"pytest {coverage_args} -k 'not test_spatialdata_curator' ./tests/core --durations=50", + f"pytest {coverage_args} --ignore=tests/core/test_curator.py ./tests/core --durations=50", ) elif group == "unit-storage": run(session, f"pytest {coverage_args} ./tests/storage --durations=50") @@ -209,10 +210,10 @@ def build(session, group): run(session, f"pytest -s {coverage_args} ./docs/faq") elif group == "storage": run(session, f"pytest -s {coverage_args} ./docs/storage") - elif group == "spatial": + elif group == "curator": run( session, - f"pytest {coverage_args} tests/core/test_curator.py -k test_spatialdata_curator --durations=50", + f"pytest {coverage_args} tests/core/test_curator.py --durations=50", ) elif group == "cli": run(session, f"pytest {coverage_args} ./sub/lamin-cli/tests --durations=50")