diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 758c86bbd..425302eaa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,9 +22,15 @@ jobs: container: "nvcr.io/nvidia/pytorch:25.03-py3" steps: - run: | - apt update || true - pip uninstall -y $(pip list --format=freeze | grep opencv) + apt-get update + apt-get install --no-install-recommends -y ffmpeg libsm6 libxext6 + pip install uv && uv --version + apt-get purge -y + rm -rf /var/lib/apt/lists/* + + uv pip uninstall --system $(pip list --format=freeze | grep opencv) rm -rf /usr/local/lib/python3.12/dist-packages/cv2/ + uv pip install --no-build-isolation opencv-python-headless name: Prepare Python - run: | curl -LsSf https://astral.sh/uv/install.sh | sh diff --git a/Dockerfile b/Dockerfile index 7cc3c1b2f..ffe093757 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,14 +17,14 @@ ENV LC_ALL=C.UTF-8 # mitigates # RuntimeError: Failed to import transformers.generation.utils because of the following error (look up to see its traceback): # numpy.dtype size changed, may indicate binary incompatibility. Expected 96 from C header, got 88 from PyObject -RUN echo "numpy<2" >> numpy-override.txt +RUN pip freeze | grep numpy > numpy-override.txt # mitigates AttributeError: module 'cv2.dnn' has no attribute 'DictValue' \ # see https://github.com/facebookresearch/nougat/issues/40 RUN apt-get update && \ - apt-get install --no-install-recommends -y tzdata ffmpeg libsm6 libxext6 && \ + apt-get install --no-install-recommends -y ffmpeg libsm6 libxext6 && \ pip install uv && uv --version && \ - apt-get purge -y --auto-remove tzdata && \ + apt-get purge -y && \ rm -rf /var/lib/apt/lists/* RUN uv pip uninstall --system $(pip list --format=freeze | grep opencv) && \ diff --git a/amd.Dockerfile b/amd.Dockerfile index c79bed1a8..1a4b5f471 100644 --- a/amd.Dockerfile +++ b/amd.Dockerfile @@ -9,21 +9,25 @@ ENV UV_BREAK_SYSTEM_PACKAGES=1 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 ENV PIP_NO_CACHE_DIR=1 ENV DEBIAN_FRONTEND=noninteractive + ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 -# - ffmpeg and CV2 dependencies are for media handling. +RUN pip freeze | grep numpy > numpy-override.txt + # mitigates AttributeError: module 'cv2.dnn' has no attribute 'DictValue' \ # see https://github.com/facebookresearch/nougat/issues/40 RUN apt-get update && \ apt-get install --no-install-recommends -y ffmpeg libsm6 libxext6 && \ pip install uv && uv --version && \ - apt-get purge -y --auto-remove tzdata && \ + apt-get purge -y && \ rm -rf /var/lib/apt/lists/* RUN uv pip install --overrides=numpy-override.txt "comfyui[attention,comfyui_manager]@git+https://github.com/hiddenswitch/ComfyUI.git" WORKDIR /workspace +# addresses https://github.com/pytorch/pytorch/issues/104801 +# and issues reported by importing nodes_canny RUN comfyui --quick-test-for-ci --cpu --cwd /workspace EXPOSE 8188 diff --git a/pyproject.toml b/pyproject.toml index 55080823e..d02f05edb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,8 +63,8 @@ dependencies = [ "natsort", "OpenEXR", "opentelemetry-distro", - "opentelemetry-sdk<1.35.0", - "opentelemetry-exporter-otlp<=1.27.0", + "opentelemetry-sdk", + "opentelemetry-exporter-otlp", "opentelemetry-propagator-jaeger", "opentelemetry-instrumentation", "opentelemetry-util-http",