diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 722e2525322..130e72de9dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -164,7 +164,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 index)" ${{ matrix.test-path }} timeout-minutes: 30 env: JINA_AUTH_TOKEN: "${{ secrets.JINA_AUTH_TOKEN }}" @@ -217,13 +217,15 @@ jobs: python -m pip install --upgrade pip python -m pip install poetry poetry install --all-extras + poetry run pip install protobuf==3.19.0 + poetry run pip install tensorflow==2.11.0 sudo apt-get update sudo apt-get install --no-install-recommends ffmpeg - name: Test id: test run: | - poetry run pytest -m 'index and (not tensorflow)' tests + poetry run pytest -m 'index' tests timeout-minutes: 30 docarray-test-tensorflow: diff --git a/tests/integrations/doc_index/__init__.py b/tests/integrations/doc_index/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/integrations/doc_index/elastic/__init__.py b/tests/integrations/doc_index/elastic/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/index/elastic/fixture.py b/tests/integrations/doc_index/elastic/fixture.py similarity index 100% rename from tests/index/elastic/fixture.py rename to tests/integrations/doc_index/elastic/fixture.py diff --git a/tests/integrations/doc_index/elastic/v7/__init__.py b/tests/integrations/doc_index/elastic/v7/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/index/elastic/v7/docker-compose.yml b/tests/integrations/doc_index/elastic/v7/docker-compose.yml similarity index 100% rename from tests/index/elastic/v7/docker-compose.yml rename to tests/integrations/doc_index/elastic/v7/docker-compose.yml diff --git a/tests/index/elastic/v7/test_column_config.py b/tests/integrations/doc_index/elastic/v7/test_column_config.py similarity index 96% rename from tests/index/elastic/v7/test_column_config.py rename to tests/integrations/doc_index/elastic/v7/test_column_config.py index 80f42c6a347..df927a2c2de 100644 --- a/tests/index/elastic/v7/test_column_config.py +++ b/tests/integrations/doc_index/elastic/v7/test_column_config.py @@ -1,8 +1,11 @@ +import pytest from pydantic import Field from docarray import BaseDoc from docarray.index import ElasticV7DocIndex -from tests.index.elastic.fixture import start_storage_v7 # noqa: F401 +from tests.integrations.doc_index.elastic.fixture import start_storage_v7 # noqa: F401 + +pytestmark = [pytest.mark.slow, pytest.mark.index] def test_column_config(): diff --git a/tests/index/elastic/v7/test_find.py b/tests/integrations/doc_index/elastic/v7/test_find.py similarity index 97% rename from tests/index/elastic/v7/test_find.py rename to tests/integrations/doc_index/elastic/v7/test_find.py index 562b6f68326..1a0503711a7 100644 --- a/tests/index/elastic/v7/test_find.py +++ b/tests/integrations/doc_index/elastic/v7/test_find.py @@ -1,12 +1,15 @@ import numpy as np +import pytest import torch from pydantic import Field from docarray import BaseDoc from docarray.index import ElasticV7DocIndex from docarray.typing import NdArray, TorchTensor -from tests.index.elastic.fixture import start_storage_v7 # noqa: F401 -from tests.index.elastic.fixture import FlatDoc, SimpleDoc +from tests.integrations.doc_index.elastic.fixture import start_storage_v7 # noqa: F401 +from tests.integrations.doc_index.elastic.fixture import FlatDoc, SimpleDoc + +pytestmark = [pytest.mark.slow, pytest.mark.index] def test_find_simple_schema(): diff --git a/tests/index/elastic/v7/test_index_get_del.py b/tests/integrations/doc_index/elastic/v7/test_index_get_del.py similarity index 96% rename from tests/index/elastic/v7/test_index_get_del.py rename to tests/integrations/doc_index/elastic/v7/test_index_get_del.py index 8389e28ffbb..d5394a7925b 100644 --- a/tests/index/elastic/v7/test_index_get_del.py +++ b/tests/integrations/doc_index/elastic/v7/test_index_get_del.py @@ -7,8 +7,15 @@ from docarray.documents import ImageDoc, TextDoc from docarray.index import ElasticV7DocIndex from docarray.typing import NdArray -from tests.index.elastic.fixture import start_storage_v7 # noqa: F401 -from tests.index.elastic.fixture import DeepNestedDoc, FlatDoc, NestedDoc, SimpleDoc +from tests.integrations.doc_index.elastic.fixture import start_storage_v7 # noqa: F401 +from tests.integrations.doc_index.elastic.fixture import ( + DeepNestedDoc, + FlatDoc, + NestedDoc, + SimpleDoc, +) + +pytestmark = [pytest.mark.slow, pytest.mark.index] @pytest.fixture