diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index c889d0a1a7..ab7dec1c0a 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -41,6 +41,7 @@ jobs: python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" python -m uv pip install -e [quality,test] python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) + python -m uv pip install compel==0.1.8 python -m uv pip install -r benchmarks/requirements.txt - name: Environment run: | diff --git a/.github/workflows/nightly_tests.yml b/.github/workflows/nightly_tests.yml index 479e5503ee..6330340487 100644 --- a/.github/workflows/nightly_tests.yml +++ b/.github/workflows/nightly_tests.yml @@ -75,6 +75,7 @@ jobs: python -m uv pip install -e [quality,test] pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git python -m uv pip install pytest-reportlog + python -m uv pip install compel==0.1.8 - name: Environment run: | python utils/print_env.py @@ -129,6 +130,7 @@ jobs: python -m uv pip install peft@git+https://github.com/huggingface/peft.git pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git python -m uv pip install pytest-reportlog + python -m uv pip install compel==0.1.8 - name: Environment run: python utils/print_env.py @@ -237,6 +239,7 @@ jobs: python -m uv pip install peft@git+https://github.com/huggingface/peft.git pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git python -m uv pip install pytest-reportlog + python -m uv pip install compel==0.1.8 - name: Environment run: | python utils/print_env.py @@ -286,6 +289,7 @@ jobs: python -m uv pip install -e [quality,test] python -m uv pip install peft@git+https://github.com/huggingface/peft.git pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git + python -m uv pip install compel==0.1.8 - name: Environment run: | diff --git a/.github/workflows/pr_dependency_test.yml b/.github/workflows/pr_dependency_test.yml index f67a9e5dd5..cd875a8011 100644 --- a/.github/workflows/pr_dependency_test.yml +++ b/.github/workflows/pr_dependency_test.yml @@ -30,6 +30,7 @@ jobs: python -m uv pip install --prerelease=allow -e . python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) python -m uv pip install pytest + python -m uv pip install compel==0.1.8 - name: Check for soft dependencies run: | python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" diff --git a/.github/workflows/pr_modular_tests.yml b/.github/workflows/pr_modular_tests.yml index 240e764426..6ad8863063 100644 --- a/.github/workflows/pr_modular_tests.yml +++ b/.github/workflows/pr_modular_tests.yml @@ -114,6 +114,7 @@ jobs: python -m uv pip install --prerelease=allow -e [quality,test] pip uninstall transformers -y && python -m uv pip install -U transformers@git+https://github.com/huggingface/transformers.git --no-deps pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git --no-deps + python -m uv pip install compel==0.1.8 - name: Environment run: | diff --git a/.github/workflows/pr_test_fetcher.yml b/.github/workflows/pr_test_fetcher.yml index bb05d1677c..670c671a6b 100644 --- a/.github/workflows/pr_test_fetcher.yml +++ b/.github/workflows/pr_test_fetcher.yml @@ -36,6 +36,7 @@ jobs: python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" python -m uv pip install --prerelease=allow -e [quality,test] python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) + python -m uv pip install compel==0.1.8 - name: Environment run: | python utils/print_env.py @@ -95,6 +96,7 @@ jobs: python -m pip install -e [quality,test] python -m pip install git+https://github.com/huggingface/transformers.git # temporary (only for tests) python -m pip install accelerate + python -m uv pip install compel==0.1.8 - name: Environment run: | @@ -153,6 +155,7 @@ jobs: python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" python -m pip install git+https://github.com/huggingface/transformers.git # temporary (only for tests) python -m pip install -e [quality,test] + python -m uv pip install compel==0.1.8 - name: Environment run: | diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml index 0b9343718c..87cfbc67d4 100644 --- a/.github/workflows/pr_tests.yml +++ b/.github/workflows/pr_tests.yml @@ -120,6 +120,7 @@ jobs: python -m uv pip install --prerelease=allow -e [quality,test] pip uninstall transformers -y && python -m uv pip install -U transformers@git+https://github.com/huggingface/transformers.git --no-deps pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git --no-deps + python -m uv pip install compel==0.1.8 - name: Environment run: | @@ -200,6 +201,7 @@ jobs: python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" python -m uv pip install --prerelease=allow -e [quality,test] python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) + python -m uv pip install compel==0.1.8 - name: Environment run: | @@ -259,6 +261,7 @@ jobs: python -m uv pip install -U transformers@git+https://github.com/huggingface/transformers.git --no-deps python -m uv pip install -U tokenizers pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git --no-deps + python -m uv pip install compel==0.1.8 - name: Environment run: | diff --git a/.github/workflows/pr_tests_gpu.yml b/.github/workflows/pr_tests_gpu.yml index f187fdee3d..29cf908d19 100644 --- a/.github/workflows/pr_tests_gpu.yml +++ b/.github/workflows/pr_tests_gpu.yml @@ -93,6 +93,7 @@ jobs: python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" python -m uv pip install --prerelease=allow -e [quality,test] python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) + python -m uv pip install compel==0.1.8 - name: Environment run: | python utils/print_env.py @@ -137,6 +138,7 @@ jobs: python -m uv pip install --prerelease=allow -e [quality,test] pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git pip uninstall transformers -y && python -m uv pip install -U transformers@git+https://github.com/huggingface/transformers.git --no-deps + python -m uv pip install compel==0.1.8 - name: Environment run: | @@ -208,6 +210,7 @@ jobs: python -m uv pip install peft@git+https://github.com/huggingface/peft.git pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git pip uninstall transformers -y && python -m uv pip install -U transformers@git+https://github.com/huggingface/transformers.git --no-deps + python -m uv pip install compel==0.1.8 - name: Environment run: | @@ -271,6 +274,7 @@ jobs: python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" pip uninstall transformers -y && python -m uv pip install -U transformers@git+https://github.com/huggingface/transformers.git --no-deps python -m uv pip install --prerelease=allow -e [quality,test,training] + python -m uv pip install compel==0.1.8 - name: Environment run: | diff --git a/.github/workflows/pr_torch_dependency_test.yml b/.github/workflows/pr_torch_dependency_test.yml index 04903af30a..cc16d3437b 100644 --- a/.github/workflows/pr_torch_dependency_test.yml +++ b/.github/workflows/pr_torch_dependency_test.yml @@ -31,6 +31,7 @@ jobs: python -m uv pip install torch torchvision torchaudio python -m uv pip install pytest python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) + python -m uv pip install compel==0.1.8 - name: Check for soft dependencies run: | python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" diff --git a/.github/workflows/push_tests.yml b/.github/workflows/push_tests.yml index 42f28bd1c7..d67c087f35 100644 --- a/.github/workflows/push_tests.yml +++ b/.github/workflows/push_tests.yml @@ -37,6 +37,7 @@ jobs: python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" python -m uv pip install --prerelease=allow -e [quality,test] python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) + python -m uv pip install compel==0.1.8 - name: Environment run: | python utils/print_env.py @@ -80,6 +81,7 @@ jobs: python -m uv pip install --prerelease=allow -e [quality,test] python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git + python -m uv pip install compel==0.1.8 - name: Environment run: | python utils/print_env.py @@ -132,6 +134,7 @@ jobs: python -m uv pip install --prerelease=allow -e [quality,test] python -m uv pip install peft@git+https://github.com/huggingface/peft.git pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git + python -m uv pip install compel==0.1.8 - name: Environment run: | @@ -185,6 +188,7 @@ jobs: python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" python -m uv pip install --prerelease=allow -e [quality,test,training] python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) + python -m uv pip install compel==0.1.8 - name: Environment run: | python utils/print_env.py @@ -229,6 +233,7 @@ jobs: python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" python -m uv pip install --prerelease=allow -e [quality,test,training] python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) + python -m uv pip install compel==0.1.8 - name: Environment run: | python utils/print_env.py @@ -271,6 +276,7 @@ jobs: python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH" python -m uv pip install --prerelease=allow -e [quality,test,training] python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) + python -m uv pip install compel==0.1.8 - name: Environment run: | diff --git a/.github/workflows/push_tests_mps.yml b/.github/workflows/push_tests_mps.yml index 193ea4c665..04dbad0324 100644 --- a/.github/workflows/push_tests_mps.yml +++ b/.github/workflows/push_tests_mps.yml @@ -45,6 +45,7 @@ jobs: ${CONDA_RUN} python -m uv pip install torch torchvision torchaudio ${CONDA_RUN} python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git ${CONDA_RUN} python -m uv pip install transformers --upgrade + ${CONDA_RUN} python -m uv pip install compel==0.1.8 - name: Environment shell: arch -arch arm64 bash {0} diff --git a/.github/workflows/run_tests_from_a_pr.yml b/.github/workflows/run_tests_from_a_pr.yml index 5212458223..84ef082093 100644 --- a/.github/workflows/run_tests_from_a_pr.yml +++ b/.github/workflows/run_tests_from_a_pr.yml @@ -67,6 +67,7 @@ jobs: python -m uv pip install -e [quality,test] python -m uv pip install --prerelease=allow git+https://github.com/huggingface/transformers.git # temporary (only for tests) python -m uv pip install peft + python -m uv pip install compel==0.1.8 - name: Run tests env: diff --git a/setup.py b/setup.py index a2e5895148..72c7ae87fb 100644 --- a/setup.py +++ b/setup.py @@ -97,7 +97,6 @@ from setuptools import Command, find_packages, setup _deps = [ "Pillow", # keep the PIL.Image.Resampling deprecation away "accelerate>=0.31.0", - "compel==0.1.8", "datasets", "filelock", "flax>=0.4.1", @@ -220,7 +219,6 @@ extras["quality"] = deps_list("urllib3", "isort", "ruff", "hf-doc-builder") extras["docs"] = deps_list("hf-doc-builder") extras["training"] = deps_list("accelerate", "datasets", "protobuf", "tensorboard", "Jinja2", "peft") extras["test"] = deps_list( - "compel", "GitPython", "datasets", "Jinja2", diff --git a/src/diffusers/dependency_versions_table.py b/src/diffusers/dependency_versions_table.py index 2f0c0819d6..8c59406040 100644 --- a/src/diffusers/dependency_versions_table.py +++ b/src/diffusers/dependency_versions_table.py @@ -4,7 +4,6 @@ deps = { "Pillow": "Pillow", "accelerate": "accelerate>=0.31.0", - "compel": "compel==0.1.8", "datasets": "datasets", "filelock": "filelock", "flax": "flax>=0.4.1",