From d74681a1287de0b47f1602235bf3b349c037852b Mon Sep 17 00:00:00 2001 From: RockChinQ <1010553892@qq.com> Date: Mon, 19 Feb 2024 18:59:52 +0800 Subject: [PATCH] =?UTF-8?q?deps:=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/dependabot.yml | 1 - pkg/core/bootutils/deps.py | 2 -- pkg/utils/pkgmgr.py | 12 ------------ requirements.txt | 2 -- 4 files changed, 17 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 55e4efc..d1973eb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,5 +11,4 @@ updates: interval: "weekly" allow: - dependency-name: "yiri-mirai-rc" - - dependency-name: "dulwich" - dependency-name: "openai" diff --git a/pkg/core/bootutils/deps.py b/pkg/core/bootutils/deps.py index db4672c..c498865 100644 --- a/pkg/core/bootutils/deps.py +++ b/pkg/core/bootutils/deps.py @@ -3,10 +3,8 @@ import pip required_deps = { "requests": "requests", "openai": "openai", - "dulwich": "dulwich", "colorlog": "colorlog", "mirai": "yiri-mirai-rc", - "func_timeout": "func_timeout", "PIL": "pillow", "nakuru": "nakuru-project-idk", "CallingGPT": "CallingGPT", diff --git a/pkg/utils/pkgmgr.py b/pkg/utils/pkgmgr.py index 8958b38..ed0d3db 100644 --- a/pkg/utils/pkgmgr.py +++ b/pkg/utils/pkgmgr.py @@ -24,18 +24,6 @@ def install_requirements(file): # log.reset_logging() -def ensure_dulwich(): - # 尝试三次 - for i in range(3): - try: - import dulwich - return - except ImportError: - install('dulwich') - - raise ImportError("无法自动安装dulwich库") - - if __name__ == "__main__": try: install("openai11") diff --git a/requirements.txt b/requirements.txt index 649ed9b..1e3d425 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,11 @@ requests openai -dulwich~=0.21.6 colorlog~=6.6.0 yiri-mirai-rc aiocqhttp qq-botpy websockets urllib3 -func_timeout~=4.3.5 Pillow CallingGPT tiktoken