From b4df698963602351646d337c455572a97a1990ec Mon Sep 17 00:00:00 2001 From: Joe Runde Date: Mon, 16 Sep 2024 10:38:11 -0600 Subject: [PATCH] :bug: fixup setuptools version for triton Signed-off-by: Joe Runde --- Dockerfile | 4 ---- requirements-common.txt | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5484be5bc5785..10a0a3eadf314 100644 --- a/Dockerfile +++ b/Dockerfile @@ -180,10 +180,6 @@ FROM vllm-base AS test ADD . /vllm-workspace/ # install development dependencies (for testing) -# A newer setuptools is required for installing some test dependencies from source that do not publish python 3.12 wheels -# This installation must complete before the test dependencies are collected and installed. -RUN --mount=type=cache,target=/root/.cache/pip \ - python3 -m pip install "setuptools>=74.1.1" RUN --mount=type=cache,target=/root/.cache/pip \ python3 -m pip install -r requirements-dev.txt diff --git a/requirements-common.txt b/requirements-common.txt index ad950d0313454..ad53395307ec5 100644 --- a/requirements-common.txt +++ b/requirements-common.txt @@ -29,4 +29,5 @@ importlib_metadata mistral_common >= 1.4.0 pyyaml six>=1.16.0; python_version > '3.11' # transitive dependency of pandas that needs to be the latest version for python 3.12 +setuptools>=74.1.1; python_version > '3.11' # Setuptools is used by triton, we need to ensure a modern version is installed for 3.12+ so that it does not try to import distutils, which was removed in 3.12 einops # Required for Qwen2-VL.