diff --git a/.evergreen/config.yml b/.evergreen/config.yml index fc50b6e..8938242 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -38,7 +38,7 @@ functions: "fetch repo": - command: subprocess.exec - type: setup + type: test params: include_expansions_in_env: [DIR] working_dir: "src" @@ -61,7 +61,7 @@ functions: "setup local atlas": - command: subprocess.exec - type: setup + type: test retry_on_failure: true params: include_expansions_in_env: [DIR] @@ -72,7 +72,7 @@ functions: "setup remote atlas": - command: subprocess.exec - type: setup + type: test params: include_expansions_in_env: [DIR] working_dir: "src" diff --git a/llama-index-python-vectorstore/patches/pin-llama-index-core.patch b/llama-index-python-vectorstore/patches/pin-llama-index-core.patch deleted file mode 100644 index 75bd176..0000000 --- a/llama-index-python-vectorstore/patches/pin-llama-index-core.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/llama-index-integrations/vector_stores/llama-index-vector-stores-mongodb/pyproject.toml b/llama-index-integrations/vector_stores/llama-index-vector-stores-mongodb/pyproject.toml -index ba22a585c..f7b6c5647 100644 ---- a/llama-index-integrations/vector_stores/llama-index-vector-stores-mongodb/pyproject.toml -+++ b/llama-index-integrations/vector_stores/llama-index-vector-stores-mongodb/pyproject.toml -@@ -41,6 +41,7 @@ jupyter = "^1.0.0" - llama-index-embeddings-openai = "^0.3.0" - llama-index-llms-openai = "^0.3.0" - llama-index-readers-file = "^0.4.0" -+llama-index-core = "^0.12.1" - mypy = "0.991" - pre-commit = "3.2.0" - pylint = "2.15.10" diff --git a/llama-index-python-vectorstore/run.sh b/llama-index-python-vectorstore/run.sh index edebfab..a7e331f 100644 --- a/llama-index-python-vectorstore/run.sh +++ b/llama-index-python-vectorstore/run.sh @@ -16,24 +16,17 @@ $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}' # shellcheck disable=SC2164 cd llama-index-integrations/vector_stores/llama-index-vector-stores-mongodb -# Install Poetry -$PYTHON_BINARY -m venv .venv -. .venv/bin/activate -PYTHON_BINARY=$(which python) -$PYTHON_BINARY -m pip install -U pip poetry -# Create a package specific poetry environment -$PYTHON_BINARY -m poetry env use $PYTHON_BINARY -# Activate the poetry env, which itself does not include poetry -. "$($PYTHON_BINARY -m poetry env info --path)/bin/activate" -# Recreate the poetry lock file -$PYTHON_BINARY -m poetry lock -# Install from pyproject.toml into package specific environment -$PYTHON_BINARY -m poetry install --with dev +# Install uv. +$PYTHON_BINARY -m venv venv_pipeline +source venv_pipeline/bin/activate +pip install -U pip +pip install uv # Run tests. +UV_PYTHON=$PYTHON_BINARY \ MONGODB_URI="$MONGODB_URI" \ OPENAI_API_KEY="$OPENAI_API_KEY" \ MONGODB_DATABASE="llama_index_test_db" \ MONGODB_COLLECTION="llama_index_test_vectorstore" \ MONGODB_INDEX="vector_index" \ -$PYTHON_BINARY -m poetry run pytest -v tests +uv run pytest -v tests