Merge branch 'main' into pull-stream-file

Joan Fontanals · web-flow · commit 75ddeb45158c · 2023-09-28T19:09:56.000+02:00
diff --git a/tests/integrations/store/test_s3.py b/tests/integrations/store/test_s3.py
@@ -8,7 +8,6 @@
 from docarray import DocList
 from docarray.documents import TextDoc
 from docarray.store import S3DocStore
-from docarray.utils._internal.pydantic import is_pydantic_v2
 from tests.integrations.store import gen_text_docs, get_test_da, profile_memory
 
 DA_LEN: int = 2**10
@@ -131,7 +130,6 @@ def test_pushpull_stream_correct(capsys):
 
 
 # for some reason this test is failing with pydantic v2
-@pytest.mark.skipif(is_pydantic_v2, reason="Not working with pydantic v2 for now")
 @pytest.mark.slow
 def test_pull_stream_vs_pull_full():
     namespace_dir = f'{BUCKET}/test{RANDOM}/pull-stream-vs-pull-full'
diff --git a/tests/units/array/test_array_from_to_pandas.py b/tests/units/array/test_array_from_to_pandas.py
@@ -6,7 +6,6 @@
 from docarray import BaseDoc, DocList, DocVec
 from docarray.documents import ImageDoc
 from docarray.typing import NdArray, TorchTensor
-from docarray.utils._internal.pydantic import is_pydantic_v2
 
 
 @pytest.fixture()
@@ -136,7 +135,6 @@ class BasisUnion(BaseDoc):
     assert docs_copy == docs_basic
 
 
-@pytest.mark.skipif(is_pydantic_v2, reason="Not working with pydantic v2")
 @pytest.mark.parametrize('tensor_type', [NdArray, TorchTensor])
 def test_from_to_pandas_tensor_type(tensor_type):
     class MyDoc(BaseDoc):
diff --git a/tests/units/document/test_base_document.py b/tests/units/document/test_base_document.py
@@ -6,7 +6,6 @@
 from docarray import DocList, DocVec
 from docarray.base_doc.doc import BaseDoc
 from docarray.typing import NdArray
-from docarray.utils._internal.pydantic import is_pydantic_v2
 
 
 def test_base_document_init():
diff --git a/tests/units/util/test_filter.py b/tests/units/util/test_filter.py
@@ -5,7 +5,6 @@
 
 from docarray import BaseDoc, DocList
 from docarray.documents import ImageDoc, TextDoc
-from docarray.utils._internal.pydantic import is_pydantic_v2
 from docarray.utils.filter import filter_docs
 
 
@@ -244,9 +243,6 @@ def test_logic_filter(docs, dict_api):
     assert len(result) == 3
 
 
-@pytest.mark.skipif(
-    is_pydantic_v2, reason="Not working with pydantic v2"
-)  # TextDoc validation with string is not working with pydantic v2
 @pytest.mark.parametrize('dict_api', [True, False])
 def test_from_docstring(dict_api):
     class MyDocument(BaseDoc):
