From 0ba238fa3e409b76838962d429693741cf04f771 Mon Sep 17 00:00:00 2001 From: ukr8b3g-cmyk Date: Tue, 25 Aug 2026 00:54:38 +0900 Subject: [PATCH] Fix GitHub Actions test dependencies --- .github/workflows/tests.yml | 2 +- MANIFEST.sha256 | 4 ++-- PROJECT_STATE.md | 9 ++++++++- WORKLOG.md | 9 +++++++++ tests/test_v35_hires_fix.py | 18 ++++++++++++++++++ 5 files changed, 38 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2a165b1..be60ed5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install --index-url https://download.pytorch.org/whl/cpu torch - python -m pip install -r requirements.txt numpy safetensors pytest + python -m pip install -r requirements.txt numpy safetensors pytest psutil - name: Compile Python run: python -m compileall -q . - name: Run tests diff --git a/MANIFEST.sha256 b/MANIFEST.sha256 index af93f55..a9f600e 100644 --- a/MANIFEST.sha256 +++ b/MANIFEST.sha256 @@ -1,5 +1,5 @@ dca65fb1393e67f59c6f81f9411e3e745eb8f1097e9a2adf7ffc6f4e3901ca9f __init__.py -15b900d02624bea6cfe8ea25b22266a0c68b38b9f10c9089be0e38988bf2e34d .github/workflows/tests.yml +4f6feeb2f63a9285b0e76fb2e2618058c7d7c279af1632e1a6ccabcc9ec9a45a .github/workflows/tests.yml 0a2f69d4cec89d440f5d5aa1ec68a7c9a741382d313f80dcddf96d13f70b3e68 .gitignore a9abe27341cb35cf7cee932a0fe4c20966b498c8fb6496c94c079d145a4eab6c AGENTS.md 10c13df0084fec25c8ac73f21431b6787918b2472c9ddf9c2c311c0d8ee3c0db CHANGELOG.md @@ -122,7 +122,7 @@ eb5b27f8f0d79529c56ef344a5601703642c3cba5388c9768116223e2ed58a36 tests/test_v3_ cf1ca6342a89e4cb02b398b32edbe91b6c1353535383e9f51d459466305a0114 tests/test_v35_conditioning_bridge.py 8b75c23dccfd1ac302596187f2fbbd1c9b71fddcb5e666aa4f9eedfd8b5b4b93 tests/test_v35_compact_ui_frontend.py b7267778fd1e77bd12d7c6e71c200fd0a4367cd8ae3276823ddeba16e015cfa6 tests/test_v35_context_sampler.py -8afd55c2db712ec5102295e03d9d82d8b0de46edad70ab70b61d4cbc588ff652 tests/test_v35_hires_fix.py +1de83989a361cd23af8a38686e27740eafd62299123c71a110dd5c0a337d136e tests/test_v35_hires_fix.py 9ceac8c3c6e4e57ec8b53b48f3b547c204df36a3f6281328aa9ab5ebc2e6a0b6 tests/test_v35_latent_resize.py 59a07f2172014dfdc0a447775324d7cd049f20b823276dfaf9b7b3f79628f5a8 tests/test_v35_pixel_vae_resize.py 4508d4d15bf48046b1664e385157f8f7f8cabdd7e6694726c8fa6e0b90ecbd1e tests/test_v35_refine_context.py diff --git a/PROJECT_STATE.md b/PROJECT_STATE.md index a9d379b..8cf449c 100644 --- a/PROJECT_STATE.md +++ b/PROJECT_STATE.md @@ -344,4 +344,11 @@ Static checks do not replace a real GPU generation. Record workflow, prompt, med - Project instructions now identify V3.5.1 as the current public baseline while retaining V3.4 node IDs, public contracts, and saved-workflow compatibility. - Last Queued Seed Reuse is classified as automated frontend-validated; real UI/cache acceptance remains pending. Package validation no longer implies completed real UI/cache acceptance. -- GitHub Issues #9 and #10 received implementation guidance and were closed as completed. Issue #11 received the conditional-UI/internal-resize explanation and remains open until the local README clarification is published. +- GitHub Issues #9, #10, and #11 received implementation guidance and are closed as completed. Issue #11 was closed after the conditional-UI/internal-resize README clarification reached public `main`. + +## GitHub Actions dependency/stub repair (2026-08-25) + +- The public V3.5.1 Actions failure was limited to the isolated CI environment: three P25 tests lacked `psutil`, and two Hi-Res Fix tests lacked ComfyUI Core's `comfy_extras.nodes_minimax_h3` module. +- `psutil` is now an Actions-only test dependency. Runtime `requirements.txt` remains dependency-free. +- `tests/test_v35_hires_fix.py` provides a file-local `comfy_extras.nodes_minimax_h3` stub containing only Core's `CANVAS_MULTIPLE = 32`. Production Core imports and Hi-Res Fix behavior are unchanged. +- Focused Hi-Res Fix/P25 validation is `16 passed`; full validation is `450 passed` with only the known `pynvml` FutureWarning. The first full local run encountered only the existing Windows global pytest temp ACL error; the accepted rerun used a dedicated writable `--basetemp`. diff --git a/WORKLOG.md b/WORKLOG.md index dd41f5b..2b3f983 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -412,3 +412,12 @@ D:\Codex\_snapshots\ComfyUI-H3-Continuum\pre-rollback-after-00038-fail-20260821_ - No implementation code, node schema, workflow, runtime, Sampling, Conditioning, Terminal Merge, Assembly, Seam, or Run Storage behavior changed. - Pre-change snapshot: `pre-v351-public-state-cleanup-source-accepted-20260825_004006` (478 files), excluding `.git` and the known ACL-inaccessible `.pytest_cache` after the standard snapshot script encountered that existing ACL condition. - Validation: release metadata `2 passed` with the ComfyUI_W venv, all 172 Manifest entries match SHA-256, and `git diff --check` passes. The system Python lacks pytest; no product-test failure occurred. + +## 2026-08-25 - GitHub Actions dependency and Core stub repair + +- Kept Production runtime code and `requirements.txt` unchanged. Added `psutil` only to the GitHub Actions test-install command for the P25 probe tests. +- Added a test-file-local `comfy_extras.nodes_minimax_h3` stub with only `CANVAS_MULTIPLE = 32`, allowing manual Hi-Res canvas tests to exercise the real Production import path without installing ComfyUI Core in CI. +- Focused Hi-Res Fix/P25 result is `16 passed`; full result is `450 passed` with only the known `pynvml` FutureWarning. The accepted full run used a dedicated writable `--basetemp` after the known global Windows pytest temp ACL caused setup-only errors. +- No Production runtime contract, Hi-Res Fix algorithm, Node ID, V3.4/V3.5 compatibility path, or runtime dependency changed. +- Pre-change snapshot: `pre-ci-dependency-stub-fix-source-accepted-20260825_005009` (478 files), excluding `.git` and the known ACL-inaccessible `.pytest_cache` after the standard snapshot script encountered that existing ACL condition. +- Confirmed the prior README clarification was already on public `main` and closed GitHub Issue #11 as completed. Issues #9, #10, and #11 are now all closed with implementation answers. diff --git a/tests/test_v35_hires_fix.py b/tests/test_v35_hires_fix.py index 2b5f049..127c0f2 100644 --- a/tests/test_v35_hires_fix.py +++ b/tests/test_v35_hires_fix.py @@ -1,5 +1,8 @@ from __future__ import annotations +import sys +import types + import pytest import torch @@ -15,6 +18,21 @@ from ComfyUI_H3_Continuum_Join.v3.hires_fix_nodes import ( from ComfyUI_H3_Continuum_Join.v3.second_pass import SecondPassContractError +@pytest.fixture(autouse=True) +def _stub_core_h3_canvas_module(monkeypatch): + comfy_extras = types.ModuleType("comfy_extras") + comfy_extras.__path__ = [] + nodes_minimax_h3 = types.ModuleType("comfy_extras.nodes_minimax_h3") + nodes_minimax_h3.CANVAS_MULTIPLE = 32 + comfy_extras.nodes_minimax_h3 = nodes_minimax_h3 + monkeypatch.setitem(sys.modules, "comfy_extras", comfy_extras) + monkeypatch.setitem( + sys.modules, + "comfy_extras.nodes_minimax_h3", + nodes_minimax_h3, + ) + + def _video(marker: str, *, height: int = 4, width: int = 4) -> dict: return { "samples": torch.zeros((1, 24, 3, height, width)),