From 5ff4b3f0bc794c9739a01d05c54de65a598f1d96 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Mon, 1 Jan 2024 10:06:46 +0900 Subject: [PATCH] fix: install.py - install GitPython before install subpack --- .gitignore | 4 +++- install.py | 12 ++++++------ modules/impact/config.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 07f87b5..43aa4d5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ wildcards/** .vscode/ .idea/ subpack -impact_subpack \ No newline at end of file +impact_subpack +*.txt +*.yaml diff --git a/install.py b/install.py index e1b5494..3cae095 100644 --- a/install.py +++ b/install.py @@ -207,12 +207,6 @@ try: except: print(f"[ERROR] ComfyUI-Impact-Pack: failed to install 'opencv-python'. Please, install manually.") - try: - import git - except Exception: - if not is_installed('gitpython'): - process_wrap(pip_install + ['gitpython']) - def ensure_mmdet_package(): try: import mmcv @@ -232,6 +226,12 @@ try: subpack_install_script = os.path.join(subpack_path, "install.py") print(f"### ComfyUI-Impact-Pack: Updating subpack") + try: + import git + except Exception: + if not is_installed('GitPython'): + process_wrap(pip_install + ['GitPython']) + ensure_subpack() # The installation of the subpack must take place before ensure_pip. cv2 triggers a permission error. if os.path.exists(subpack_install_script): diff --git a/modules/impact/config.py b/modules/impact/config.py index 70d4277..12849ab 100644 --- a/modules/impact/config.py +++ b/modules/impact/config.py @@ -2,7 +2,7 @@ import configparser import os -version = "V4.56" +version = "V4.56.1" dependency_version = 20