Merge branch 'dev/1.26' into implement-async-client

weaviate · Jul 5, 2024 · d9f21e0 · d9f21e0
2 parents b82a79c + 4602a26
commit d9f21e0
Show file tree

Hide file tree

Showing 19 changed files with 901 additions and 571 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -17,8 +17,7 @@ env:
   WEAVIATE_123: 1.23.16
   WEAVIATE_124: 1.24.19
   WEAVIATE_125: 1.25.5
-  WEAVIATE_126: 1.26.0-rc.0
-
+  WEAVIATE_126: preview-allow-new-tenant-names-as-input-for-add-and-update-b6f5b8e
 
 
 jobs:

diff --git a/integration/conftest.py b/integration/conftest.py
@@ -31,11 +31,10 @@
     _VectorIndexConfigCreate,
     _RerankerConfigCreate,
 )
+from weaviate.collections.classes.config_named_vectors import _NamedVectorConfigCreate
 from weaviate.collections.classes.types import Properties
 from weaviate.config import AdditionalConfig
 
-from weaviate.collections.classes.config_named_vectors import _NamedVectorConfigCreate
-
 
 class CollectionFactory(Protocol):
     """Typing for fixture."""
@@ -132,7 +131,10 @@ def _factory(
             nonlocal client_fixture, name_fixtures, call_counter
             call_counter += 1
             name_fixture = (
-                _sanitize_collection_name(request.node.name) + name + "_" + str(call_counter)
+                _sanitize_collection_name(request.node.fspath.basename + "_" + request.node.name)
+                + name
+                + "_"
+                + str(call_counter)
             )
             name_fixtures.append(name_fixture)
             client_fixture = client_factory(