From 1a1c194faf5ead126ffd4e067baf92019e3a40f8 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Wed, 16 Oct 2024 11:20:21 -0700 Subject: [PATCH] Consolidate langchain fixtures, fix conda command --- tests/morpheus_llm/stages/arxiv/conftest.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/morpheus_llm/stages/arxiv/conftest.py b/tests/morpheus_llm/stages/arxiv/conftest.py index 671a7b4317..bc705f9b36 100644 --- a/tests/morpheus_llm/stages/arxiv/conftest.py +++ b/tests/morpheus_llm/stages/arxiv/conftest.py @@ -20,10 +20,10 @@ from _utils import import_or_skip -SKIP_REASON = ("Tests for the arxiv_source require a number of packages not installed in the Morpheus development " - "environment. To install these run:\n" - "`conda env update --solver=libmamba -n morpheus " - "--file conda/environments/dev_cuda-125_arch-x86_64.yaml --prune`") +SKIP_REASON = ( + "Tests for the arxiv_source require a number of packages not installed in the Morpheus development " + "environment. To install these run:\n" + "`conda env update --solver=libmamba -n morpheus --file conda/environments/examples_cuda-125_arch-x86_64.yaml`") @pytest.fixture(name="arxiv", autouse=True, scope='session') @@ -35,19 +35,19 @@ def arxiv_fixture(fail_missing: bool): @pytest.fixture(name="langchain", autouse=True, scope='session') -def langchain_fixture(fail_missing: bool): +def langchain_fixture(langchain): """ All of the tests in this subdir require langchain """ - yield import_or_skip("langchain", reason=SKIP_REASON, fail_missing=fail_missing) + yield langchain @pytest.fixture(name="langchain_community", autouse=True, scope='session') -def langchain_community_fixture(fail_missing: bool): +def langchain_community_fixture(langchain_community): """ All of the tests in this subdir require langchain_community """ - yield import_or_skip("langchain_community", reason=SKIP_REASON, fail_missing=fail_missing) + yield langchain_community @pytest.fixture(name="pypdf", autouse=True, scope='session')