Files
Comfy-Org-ComfyUI-Manager/tests/test_pip_package_names.py
Dr.Lt.Data 1ad89f69cd Apply pip blacklists however a requirement is written (#3521)
Port the pip requirement checks of manager-v4 (#3489) to main, so that
both branches decide with the same code. #3431 had only replaced the
version class in main's own checks, which left ">" and "~=" answered
differently from v4.

- Parse requirements with packaging and share one parser and one
  downgrade decision between manager_core and the startup check
- Treat '-', '_' and '.' as one separator in package names, in the
  installed-package lookup, both lists, requirements and
  pip_auto_fix.list (#3458)
- Read every version clause, so a lower bound written first no longer
  hides an upper bound; read spaces, parentheses, markers, '===' and
  direct references
- Install a requirement with extras unless it would downgrade the
  protected package
- Check the requirement of every pip install command form, including
  those with --index-url, on the immediate and reserved paths
- Skip a protected package when the requirement cannot be compared and
  log why and how to install it
- At startup, recognize an installed package however its requirement
  spells the name, install one older than its '~=' version or at the
  version that '>' excludes, and stop reinstalling the '~=' version
  itself
- Read downgrade_blacklist from config.ini in cm-cli, which read a
  path attribute that does not exist and so protected only the
  built-in packages
- Remove the unused is_installed copy from manager_core and the
  pip_version helper that #3431 added
- Import packaging where it is used, because prestartup_script imports
  manager_util before it installs missing dependencies
- Add the tests of #3489, adapted to main, and tests for the startup
  loop, '>', pip_auto_fix.list names and the cm-cli setting; update
  README and CHANGELOG

manager-v4 needs no counterpart: it has this code since #3489.
2026-11-14 18:14:54 +09:00

84 lines
3.2 KiB
Python

"""Exercise the real pip guards without running Manager's startup side effects."""
import ast
import re
from types import SimpleNamespace
import pytest
from manager_test_utils import GLOB_DIR, load_manager_util
GUARDS = [
(GLOB_DIR / "manager_core.py", "is_blacklisted"),
(GLOB_DIR.resolve().parent / "prestartup_script.py", "is_installed"),
]
@pytest.fixture
def manager_util(monkeypatch):
"""Feed pip's display names through the production inventory parser."""
module = load_manager_util()
inventory = "Package Version\n------- -------\nOpenCV-Python 5.0.0.93\nnumpy 2.0.0\n"
monkeypatch.setattr(module.subprocess, "check_output", lambda *args, **kwargs: inventory)
return module
@pytest.fixture(params=GUARDS, ids=[f"{path.name}:{name}" for path, name in GUARDS])
def guard(request, manager_util):
"""Compile unchanged function bodies; do not import startup/install hooks."""
path, name = request.param
if not path.exists():
pytest.skip("MANAGER_GLOB_DIR points at a glob directory without prestartup_script.py beside it")
tree = ast.parse(path.read_text(encoding="utf-8"))
function = next(node for node in tree.body if isinstance(node, ast.FunctionDef) and node.name == name)
config = SimpleNamespace(pip_blacklist=set(), pip_downgrade_blacklist=["opencv-python", "numpy"])
namespace = {"re": re, "cm_global": config, "manager_util": manager_util}
exec(compile(ast.Module(body=[function], type_ignores=[]), str(path), "exec"), namespace)
return namespace[name], config, name
@pytest.mark.parametrize(
"requirement",
["opencv-python~=4.8.1.78", "OpenCV_Python==4.8.1.78", "OPENCV-PYTHON<4.9.0", "opencv-python"],
)
def test_protected_package_is_recognized(guard, requirement):
"""A display-name alias must not bypass downgrade protection."""
check, _, _ = guard
assert check(requirement) is True
def test_blacklist_entry_uses_the_same_name_format(guard):
"""Configuration aliases must match the inventory and requirement names."""
check, config, _ = guard
config.pip_downgrade_blacklist = ["OpenCV_Python"]
assert check("opencv-python~=4.8.1.78") is True
config.pip_downgrade_blacklist = []
config.pip_blacklist = {"OpenCV-Python"}
assert check("opencv_python>=6.0.0") is True
def test_upgrade_is_still_allowed(guard):
"""Protection must not suppress an upgrade to a newer required version."""
check, _, _ = guard
assert check("opencv-python>=6.0.0") is False
def test_missing_package_is_not_reported_installed(guard):
"""A protected name alone does not mean the package is installed."""
check, config, _ = guard
config.pip_downgrade_blacklist.append("missing-package")
assert check("missing-package==1.0.0") is False
def test_existing_simple_package_protection(guard):
"""The existing NumPy downgrade guard must continue to work."""
check, _, _ = guard
assert check("numpy==1.26.4") is True
def test_unprotected_installed_package(guard):
"""Installed status remains distinct from blacklist membership."""
check, config, name = guard
config.pip_downgrade_blacklist = []
assert check("opencv-python") is (name == "is_installed")