From 16317cca6d0232d1a74037e28587f8d1517f3704 Mon Sep 17 00:00:00 2001 From: samsja Date: Tue, 21 Mar 2023 13:09:38 +0100 Subject: [PATCH 1/3] fix: move test to integration test Signed-off-by: samsja --- tests/{ => integrations/doc_index}/doc_index/__init__.py | 0 .../doc_index}/doc_index/base_classes/__init__.py | 0 .../doc_index}/doc_index/base_classes/test_base_doc_store.py | 0 .../doc_index}/doc_index/base_classes/test_configs.py | 0 tests/{ => integrations/doc_index}/doc_index/hnswlib/__init__.py | 0 tests/{ => integrations/doc_index}/doc_index/hnswlib/test_find.py | 0 .../doc_index}/doc_index/hnswlib/test_index_get_del.py | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename tests/{ => integrations/doc_index}/doc_index/__init__.py (100%) rename tests/{ => integrations/doc_index}/doc_index/base_classes/__init__.py (100%) rename tests/{ => integrations/doc_index}/doc_index/base_classes/test_base_doc_store.py (100%) rename tests/{ => integrations/doc_index}/doc_index/base_classes/test_configs.py (100%) rename tests/{ => integrations/doc_index}/doc_index/hnswlib/__init__.py (100%) rename tests/{ => integrations/doc_index}/doc_index/hnswlib/test_find.py (100%) rename tests/{ => integrations/doc_index}/doc_index/hnswlib/test_index_get_del.py (100%) diff --git a/tests/doc_index/__init__.py b/tests/integrations/doc_index/doc_index/__init__.py similarity index 100% rename from tests/doc_index/__init__.py rename to tests/integrations/doc_index/doc_index/__init__.py diff --git a/tests/doc_index/base_classes/__init__.py b/tests/integrations/doc_index/doc_index/base_classes/__init__.py similarity index 100% rename from tests/doc_index/base_classes/__init__.py rename to tests/integrations/doc_index/doc_index/base_classes/__init__.py diff --git a/tests/doc_index/base_classes/test_base_doc_store.py b/tests/integrations/doc_index/doc_index/base_classes/test_base_doc_store.py similarity index 100% rename from tests/doc_index/base_classes/test_base_doc_store.py rename to tests/integrations/doc_index/doc_index/base_classes/test_base_doc_store.py diff --git a/tests/doc_index/base_classes/test_configs.py b/tests/integrations/doc_index/doc_index/base_classes/test_configs.py similarity index 100% rename from tests/doc_index/base_classes/test_configs.py rename to tests/integrations/doc_index/doc_index/base_classes/test_configs.py diff --git a/tests/doc_index/hnswlib/__init__.py b/tests/integrations/doc_index/doc_index/hnswlib/__init__.py similarity index 100% rename from tests/doc_index/hnswlib/__init__.py rename to tests/integrations/doc_index/doc_index/hnswlib/__init__.py diff --git a/tests/doc_index/hnswlib/test_find.py b/tests/integrations/doc_index/doc_index/hnswlib/test_find.py similarity index 100% rename from tests/doc_index/hnswlib/test_find.py rename to tests/integrations/doc_index/doc_index/hnswlib/test_find.py diff --git a/tests/doc_index/hnswlib/test_index_get_del.py b/tests/integrations/doc_index/doc_index/hnswlib/test_index_get_del.py similarity index 100% rename from tests/doc_index/hnswlib/test_index_get_del.py rename to tests/integrations/doc_index/doc_index/hnswlib/test_index_get_del.py From e42e9f63b7f01f026c77a08e86d19c3ae7fcd55a Mon Sep 17 00:00:00 2001 From: samsja Date: Tue, 21 Mar 2023 13:25:48 +0100 Subject: [PATCH 2/3] fix: use a different runner for doc index Signed-off-by: samsja --- .github/workflows/ci.yml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c2ea1bc7ce..a22da676810 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,7 +117,7 @@ jobs: - name: Test id: test run: | - poetry run pytest -m "not (tensorflow or benchmark)" ${{ matrix.test-path }} + poetry run pytest -m "not (tensorflow or benchmark or doc_index)" ${{ matrix.test-path }} timeout-minutes: 30 # env: # JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" @@ -194,6 +194,32 @@ jobs: timeout-minutes: 30 + docarray-doc-index: + needs: [lint-ruff, check-black, import-test] + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7] + steps: + - uses: actions/checkout@v2.5.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Prepare environment + run: | + python -m pip install --upgrade pip + python -m pip install poetry + poetry install --all-extras + sudo apt-get install --no-install-recommends ffmpeg + + - name: Test + id: test + run: | + poetry run pytest -m 'doc_index' tests + timeout-minutes: 30 + docarray-test-tensorflow: needs: [lint-ruff, check-black, import-test] runs-on: ubuntu-latest From 46581aa0593cee282bcbbf4e8ec9accdf7ac525d Mon Sep 17 00:00:00 2001 From: samsja Date: Tue, 21 Mar 2023 13:26:20 +0100 Subject: [PATCH 3/3] fix: use a different runner for doc index Signed-off-by: samsja --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a22da676810..25499f60d8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -276,7 +276,7 @@ jobs: # just for blocking the merge until all parallel core-test are successful success-all-test: - needs: [docarray-test, docarray-test-proto3, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] + needs: [docarray-test, docarray-test-proto3, docarray-doc-index, docarray-test-tensorflow, docarray-test-benchmarks, import-test, check-black, check-mypy, lint-ruff] if: always() runs-on: ubuntu-latest steps: