Import FixtureRequest from pytest (#645)

Author: cbornet

libs/colbert/tests/integration_tests/conftest.py

@@ -1,7 +1,6 @@
 from typing import Iterator
 
 import pytest
-from _pytest.fixtures import FixtureRequest
 from cassandra.cluster import Session
 from ragstack_tests_utils import AstraDBTestStore, LocalCassandraTestStore
 
@@ -20,7 +19,7 @@ def astra_db() -> AstraDBTestStore:
 
 
 @pytest.fixture()
-def session(request: FixtureRequest) -> Session:
+def session(request: pytest.FixtureRequest) -> Session:
     test_store = request.getfixturevalue(request.param)
     session = test_store.create_cassandra_session()
     session.default_timeout = 180

libs/langchain/tests/integration_tests/conftest.py

@@ -1,7 +1,6 @@
 from typing import Iterator
 
 import pytest
-from _pytest.fixtures import FixtureRequest
 from cassandra.cluster import Session
 from dotenv import load_dotenv
 from ragstack_tests_utils import AstraDBTestStore, LocalCassandraTestStore
@@ -22,13 +21,13 @@ def astra_db() -> AstraDBTestStore:
     return AstraDBTestStore()
 
 
-def get_session(request: FixtureRequest) -> Session:
+def get_session(request: pytest.FixtureRequest) -> Session:
     test_store = request.getfixturevalue(request.param)
     session = test_store.create_cassandra_session()
     session.default_timeout = 180
     return session
 
 
 @pytest.fixture()
-def session(request: FixtureRequest) -> Session:
+def session(request: pytest.FixtureRequest) -> Session:
     return get_session(request)

libs/llamaindex/tests/integration_tests/conftest.py

@@ -1,7 +1,6 @@
 from typing import Iterator
 
 import pytest
-from _pytest.fixtures import FixtureRequest
 from cassandra.cluster import Session
 from ragstack_tests_utils import AstraDBTestStore, LocalCassandraTestStore
 
@@ -20,7 +19,7 @@ def astra_db() -> AstraDBTestStore:
 
 
 @pytest.fixture()
-def session(request: FixtureRequest) -> Session:
+def session(request: pytest.FixtureRequest) -> Session:
     test_store = request.getfixturevalue(request.param)
     session = test_store.create_cassandra_session()
     session.default_timeout = 180