From c8d5f99f106a71d5e81c609c87b8358beaa7e5d5 Mon Sep 17 00:00:00 2001 From: tzhouam Date: Sat, 3 Oct 2026 22:03:13 +0800 Subject: [PATCH] fix: scope CI package version overrides to Omni Signed-off-by: tzhouam --- docker/Dockerfile.ci | 3 ++- docker/Dockerfile.ci.dockerignore | 2 +- docker/Dockerfile.rocm | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.ci b/docker/Dockerfile.ci index a98af29c4..c1e9cdbe2 100644 --- a/docker/Dockerfile.ci +++ b/docker/Dockerfile.ci @@ -36,7 +36,8 @@ RUN apt-get update && \ # for CI COPY pyproject.toml setup.py ./ COPY requirements/ requirements/ -ENV SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0 +# Scope the override to Omni; dependency source builds need their own versions. +ENV VLLM_OMNI_VERSION_OVERRIDE=0.0.0 # Editable install: deps + project metadata are cached in this layer, while # the package itself is linked to APP_DIR (populated later by COPY --link). # Do NOT use a non-editable install here — that copies an empty stub into diff --git a/docker/Dockerfile.ci.dockerignore b/docker/Dockerfile.ci.dockerignore index ab137c2b5..4564eb75e 100644 --- a/docker/Dockerfile.ci.dockerignore +++ b/docker/Dockerfile.ci.dockerignore @@ -1,6 +1,6 @@ # NOTE: this is largely taken from vLLM -# Exclude .git for CI builds — version is set via SETUPTOOLS_SCM_PRETEND_VERSION +# Exclude .git for CI builds — version is set via VLLM_OMNI_VERSION_OVERRIDE .git .venv /build diff --git a/docker/Dockerfile.rocm b/docker/Dockerfile.rocm index 78ddac818..04dff295a 100644 --- a/docker/Dockerfile.rocm +++ b/docker/Dockerfile.rocm @@ -76,7 +76,8 @@ WORKDIR ${COMMON_WORKDIR}/vllm-omni RUN mkdir -p vllm_omni && touch vllm_omni/__init__.py COPY pyproject.toml setup.py ./ COPY requirements/ requirements/ -ENV SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0 +# Scope the override to Omni; dependency source builds need their own versions. +ENV VLLM_OMNI_VERSION_OVERRIDE=0.0.0 RUN uv pip install --python "$(python3 -c 'import sys; print(sys.executable)')" \ --no-cache-dir -e ".[dev]" --no-build-isolation && \