diff --git a/.github/workflows/build_linux_wheel/action.yml b/.github/workflows/build_linux_wheel/action.yml index b9603cd0..6e014663 100644 --- a/.github/workflows/build_linux_wheel/action.yml +++ b/.github/workflows/build_linux_wheel/action.yml @@ -31,7 +31,7 @@ runs: with: command: build working-directory: python - docker-options: "-e PIP_EXTRA_INDEX_URL=https://pypi.fury.io/lancedb/" + docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'" target: x86_64-unknown-linux-gnu manylinux: ${{ inputs.manylinux }} args: ${{ inputs.args }} @@ -46,7 +46,7 @@ runs: with: command: build working-directory: python - docker-options: "-e PIP_EXTRA_INDEX_URL=https://pypi.fury.io/lancedb/" + docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'" target: aarch64-unknown-linux-gnu manylinux: ${{ inputs.manylinux }} args: ${{ inputs.args }} diff --git a/.github/workflows/build_mac_wheel/action.yml b/.github/workflows/build_mac_wheel/action.yml index bf740c79..7dd3af17 100644 --- a/.github/workflows/build_mac_wheel/action.yml +++ b/.github/workflows/build_mac_wheel/action.yml @@ -22,5 +22,5 @@ runs: command: build # TODO: pass through interpreter args: ${{ inputs.args }} - docker-options: "-e PIP_EXTRA_INDEX_URL=https://pypi.fury.io/lancedb/" + docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'" working-directory: python diff --git a/.github/workflows/build_windows_wheel/action.yml b/.github/workflows/build_windows_wheel/action.yml index e4e07735..03ba12e0 100644 --- a/.github/workflows/build_windows_wheel/action.yml +++ b/.github/workflows/build_windows_wheel/action.yml @@ -26,7 +26,7 @@ runs: with: command: build args: ${{ inputs.args }} - docker-options: "-e PIP_EXTRA_INDEX_URL=https://pypi.fury.io/lancedb/" + docker-options: "-e PIP_EXTRA_INDEX_URL='https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/'" working-directory: python - uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0dc3d57c..a325ad1b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -24,7 +24,7 @@ env: # according to: https://matklad.github.io/2021/09/04/fast-rust-builds.html # CI builds are faster with incremental disabled. CARGO_INCREMENTAL: "0" - PIP_EXTRA_INDEX_URL: "https://pypi.fury.io/lancedb/" + PIP_EXTRA_INDEX_URL: "https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/" jobs: # Single deploy job since we're just deploying @@ -50,8 +50,8 @@ jobs: - name: Build Python working-directory: python run: | - python -m pip install --extra-index-url https://pypi.fury.io/lancedb/ -e . - python -m pip install --extra-index-url https://pypi.fury.io/lancedb/ -r ../docs/requirements.txt + python -m pip install --extra-index-url https://pypi.fury.io/lance-format/ --extra-index-url https://pypi.fury.io/lancedb/ -e . + python -m pip install --extra-index-url https://pypi.fury.io/lance-format/ --extra-index-url https://pypi.fury.io/lancedb/ -r ../docs/requirements.txt - name: Set up node uses: actions/setup-node@v3 with: diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 6390bc8d..8f369495 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -11,7 +11,7 @@ on: - Cargo.toml # Change in dependency frequently breaks builds env: - PIP_EXTRA_INDEX_URL: "https://pypi.fury.io/lancedb/" + PIP_EXTRA_INDEX_URL: "https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/" jobs: linux: diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 60a18ac8..460197b7 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -18,7 +18,7 @@ env: # Color output for pytest is off by default. PYTEST_ADDOPTS: "--color=yes" FORCE_COLOR: "1" - PIP_EXTRA_INDEX_URL: "https://pypi.fury.io/lancedb/" + PIP_EXTRA_INDEX_URL: "https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/" RUST_BACKTRACE: "1" jobs: @@ -100,7 +100,7 @@ jobs: sudo apt install -y protobuf-compiler - name: Install run: | - pip install --extra-index-url https://pypi.fury.io/lancedb/ -e .[tests,dev,embeddings] + pip install --extra-index-url https://pypi.fury.io/lance-format/ --extra-index-url https://pypi.fury.io/lancedb/ -e .[tests,dev,embeddings] pip install tantivy pip install mlx - name: Doctest @@ -226,7 +226,7 @@ jobs: run: | pip install "pydantic<2" pip install pyarrow==16 - pip install --extra-index-url https://pypi.fury.io/lancedb/ -e .[tests] + pip install --extra-index-url https://pypi.fury.io/lance-format/ --extra-index-url https://pypi.fury.io/lancedb/ -e .[tests] pip install tantivy - name: Run tests run: pytest -m "not slow and not s3_test" -x -v --durations=30 python/tests diff --git a/.github/workflows/run_tests/action.yml b/.github/workflows/run_tests/action.yml index ac7bf4f3..90d6a405 100644 --- a/.github/workflows/run_tests/action.yml +++ b/.github/workflows/run_tests/action.yml @@ -15,7 +15,7 @@ runs: - name: Install lancedb shell: bash run: | - pip3 install --extra-index-url https://pypi.fury.io/lancedb/ $(ls target/wheels/lancedb-*.whl)[tests,dev] + pip3 install --extra-index-url https://pypi.fury.io/lance-format/ --extra-index-url https://pypi.fury.io/lancedb/ $(ls target/wheels/lancedb-*.whl)[tests,dev] - name: Setup localstack for integration tests if: ${{ inputs.integration == 'true' }} shell: bash diff --git a/python/Makefile b/python/Makefile index cb58822f..60554c46 100644 --- a/python/Makefile +++ b/python/Makefile @@ -1,11 +1,11 @@ -PIP_EXTRA_INDEX_URL ?= https://pypi.fury.io/lancedb/ +PIP_EXTRA_INDEX_URL ?= https://pypi.fury.io/lance-format/ https://pypi.fury.io/lancedb/ help: ## Show this help. @sed -ne '/@sed/!s/## //p' $(MAKEFILE_LIST) .PHONY: develop develop: ## Install the package in development mode. - PIP_EXTRA_INDEX_URL=$(PIP_EXTRA_INDEX_URL) maturin develop --extras tests,dev,embeddings + PIP_EXTRA_INDEX_URL="$(PIP_EXTRA_INDEX_URL)" maturin develop --extras tests,dev,embeddings .PHONY: format format: ## Format the code.