Skip to content

fix: mark es test as index #1314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samsja merged 5 commits into from
Mar 30, 2023
Merged

fix: mark es test as index #1314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a145c7d
fix: mark es test as index
samsja Mar 30, 2023
a78e6c5
fix: mark es test as index
samsja Mar 30, 2023
c012a5a
Merge branch 'feat-rewrite-v2' into fix-test-es
samsja Mar 30, 2023
f442c21
fix: ci
samsja Mar 30, 2023
9659c90
fix: ci
samsja Mar 30, 2023
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
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down Expand Up @@ -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:
Expand Down
Empty file added tests/integrations/doc_index/__init__.py
View file
Open in desktop
Empty file.
Empty file added tests/integrations/doc_index/elastic/__init__.py
View file
Open in desktop
Empty file.
0 tests/index/elastic/fixture.py → ...integrations/doc_index/elastic/fixture.py
View file
Open in desktop
File renamed without changes.
Empty file added tests/integrations/doc_index/elastic/v7/__init__.py
View file
Open in desktop
Empty file.
0 tests/index/elastic/v7/docker-compose.yml → ...s/doc_index/elastic/v7/docker-compose.yml
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion tests/index/elastic/v7/test_column_config.py → ...oc_index/elastic/v7/test_column_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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():
Expand Down
7 changes: 5 additions & 2 deletions tests/index/elastic/v7/test_find.py → ...rations/doc_index/elastic/v7/test_find.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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():
Expand Down
11 changes: 9 additions & 2 deletions tests/index/elastic/v7/test_index_get_del.py → ...oc_index/elastic/v7/test_index_get_del.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down