Skip to content

chore: ci use different worker for each DocIndex #1375

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 4 commits into from
Apr 14, 2023
Merged

chore: ci use different worker for each DocIndex #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7cb47f
fix: fix ci
samsja Apr 14, 2023
e6bc635
fix: remove linux mark
samsja Apr 14, 2023
888fe66
fix: weavite stf
samsja Apr 14, 2023
6952206
fix: fix lock file
samsja Apr 14, 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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ jobs:
fail-fast: false
matrix:
python-version: [3.7]
db_test_folder: [base_classes, elastic, hnswlib, qdrant, weaviate]
steps:
- uses: actions/[email protected]
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -225,7 +226,7 @@ jobs:
- name: Test
id: test
run: |
poetry run pytest -m 'index and not elasticv8' tests
poetry run pytest -m 'index and not elasticv8' tests/index/${{ matrix.db_test_folder }}
timeout-minutes: 30


Expand Down
2,135 changes: 856 additions & 1,279 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

Empty file added tests/index/weaviate/__init__.py
View file
Open in desktop
Empty file.
0 ...ons/doc_index/weaviate/docker-compose.yml → tests/index/weaviate/docker-compose.yml
View file
Open in desktop
File renamed without changes.
0 ...ns/doc_index/weaviate/fixture_weaviate.py → tests/index/weaviate/fixture_weaviate.py
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion ...x/weaviate/test_column_config_weaviate.py → ...x/weaviate/test_column_config_weaviate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
# TODO: enable ruff qa on this file when we figure out why it thinks weaviate_client is
# redefined at each test that fixture
# ruff: noqa
import pytest
from pydantic import Field

from docarray import BaseDoc
from docarray.index.backends.weaviate import WeaviateDocumentIndex
from tests.integrations.doc_index.weaviate.fixture_weaviate import ( # noqa: F401
from tests.index.weaviate.fixture_weaviate import ( # noqa: F401
start_storage,
weaviate_client,
)

pytestmark = [pytest.mark.slow, pytest.mark.index]


def test_column_config(weaviate_client):
def get_text_field_data_type(store, index_name):
Expand Down
4 changes: 3 additions & 1 deletion .../doc_index/weaviate/test_find_weaviate.py → tests/index/weaviate/test_find_weaviate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
from docarray import BaseDoc
from docarray.index.backends.weaviate import WeaviateDocumentIndex
from docarray.typing import TorchTensor
from tests.integrations.doc_index.weaviate.fixture_weaviate import ( # noqa: F401
from tests.index.weaviate.fixture_weaviate import ( # noqa: F401
start_storage,
weaviate_client,
)

pytestmark = [pytest.mark.slow, pytest.mark.index]


def test_find_torch(weaviate_client):
class TorchDoc(BaseDoc):
Expand Down
5 changes: 3 additions & 2 deletions ...x/weaviate/test_index_get_del_weaviate.py → ...x/weaviate/test_index_get_del_weaviate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
WeaviateDocumentIndex,
)
from docarray.typing import NdArray
from tests.integrations.doc_index.weaviate.fixture_weaviate import ( # noqa: F401
from tests.index.weaviate.fixture_weaviate import ( # noqa: F401
HOST,
start_storage,
weaviate_client,
)

pytestmark = [pytest.mark.slow, pytest.mark.index]


class SimpleDoc(BaseDoc):
tens: NdArray[10] = Field(dim=1000, is_embedding=True)
Expand Down Expand Up @@ -440,7 +442,6 @@ def test_limit_query_builder(test_store):
assert len(docs) == 2


@pytest.mark.linux
def test_embedded_weaviate():
class Document(BaseDoc):
text: str
Expand Down