From f40f53945686aba0be8fc5497ee3bb9802c8f903 Mon Sep 17 00:00:00 2001 From: Andy Lee Date: Wed, 24 Sep 2025 00:50:27 -0700 Subject: [PATCH] CI: revert install step to match main --- .github/workflows/build-reusable.yml | 64 ++++------------------------ 1 file changed, 9 insertions(+), 55 deletions(-) diff --git a/.github/workflows/build-reusable.yml b/.github/workflows/build-reusable.yml index 7cb85c1..1ad300d 100644 --- a/.github/workflows/build-reusable.yml +++ b/.github/workflows/build-reusable.yml @@ -302,64 +302,18 @@ jobs: - name: Install built packages for testing run: | - # Create a virtual environment using the matrix interpreter - python -m venv .venv + # Create a virtual environment with the correct Python version + uv venv --python ${{ matrix.python }} source .venv/bin/activate || source .venv/Scripts/activate - # Make sure pip tooling is up to date - python -m pip install --upgrade pip + # Install packages using --find-links to prioritize local builds + uv pip install --find-links packages/leann-core/dist --find-links packages/leann-backend-hnsw/dist --find-links packages/leann-backend-diskann/dist packages/leann-core/dist/*.whl || uv pip install --find-links packages/leann-core/dist packages/leann-core/dist/*.tar.gz + uv pip install --find-links packages/leann-core/dist packages/leann-backend-hnsw/dist/*.whl + uv pip install --find-links packages/leann-core/dist packages/leann-backend-diskann/dist/*.whl + uv pip install packages/leann/dist/*.whl || uv pip install packages/leann/dist/*.tar.gz - # Install test tools only first, without including the project itself - uv sync --only-group test - - # Install local build artifacts directly so uv resolves dependencies from indexes but uses local wheels - CORE_WHL=$(find packages/leann-core/dist -maxdepth 1 -name "*.whl" -print -quit) - if [[ -n "$CORE_WHL" ]]; then - uv pip install "$CORE_WHL" - else - uv pip install packages/leann-core/dist/*.tar.gz - fi - - # Derive ABI tag for this interpreter - PY_TAG=$(python -c "import sys; print(f'cp{sys.version_info[0]}{sys.version_info[1]}')") - - # Ensure macOS builds use a deployment target compatible with LAPACK symbols when compiling from source - if [[ "$RUNNER_OS" == "macOS" ]]; then - if [[ "${{ matrix.os }}" == "macos-13" ]]; then - export MACOSX_DEPLOYMENT_TARGET=13.3 - elif [[ "${{ matrix.os }}" == "macos-14" ]]; then - export MACOSX_DEPLOYMENT_TARGET=14.0 - elif [[ "${{ matrix.os }}" == "macos-15" ]]; then - export MACOSX_DEPLOYMENT_TARGET=15.0 - fi - fi - - HNSW_WHL=$(find packages/leann-backend-hnsw/dist -maxdepth 1 -name "*-${PY_TAG}-*.whl" -print -quit) - if [[ -z "$HNSW_WHL" ]]; then - HNSW_WHL=$(find packages/leann-backend-hnsw/dist -maxdepth 1 -name "*-py3-*.whl" -print -quit) - fi - if [[ -n "$HNSW_WHL" ]]; then - uv pip install "$HNSW_WHL" - else - uv pip install ./packages/leann-backend-hnsw - fi - - DISKANN_WHL=$(find packages/leann-backend-diskann/dist -maxdepth 1 -name "*-${PY_TAG}-*.whl" -print -quit) - if [[ -z "$DISKANN_WHL" ]]; then - DISKANN_WHL=$(find packages/leann-backend-diskann/dist -maxdepth 1 -name "*-py3-*.whl" -print -quit) - fi - if [[ -n "$DISKANN_WHL" ]]; then - uv pip install "$DISKANN_WHL" - else - uv pip install ./packages/leann-backend-diskann - fi - - LEANN_WHL=$(find packages/leann/dist -maxdepth 1 -name "*.whl" -print -quit) - if [[ -n "$LEANN_WHL" ]]; then - uv pip install "$LEANN_WHL" - else - uv pip install packages/leann/dist/*.tar.gz - fi + # Install test dependencies using extras + uv pip install -e ".[test]" - name: Run tests with pytest env: