From 374b7b7261ef6b30f3bdf2915f964798fa8f3b16 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 May 2022 23:42:48 +0000 Subject: [PATCH 1/2] Auto generate poetry.lock --- poetry.lock | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/poetry.lock b/poetry.lock index 86ec4636..470f9a51 100644 --- a/poetry.lock +++ b/poetry.lock @@ -246,11 +246,6 @@ python-versions = "*" [package.extras] test = ["flake8 (==3.7.8)", "hypothesis (==3.55.3)"] -[package.source] -type = "legacy" -url = "https://mirrors.aliyun.com/pypi/simple" -reference = "ali" - [[package]] name = "cycler" version = "0.11.0" @@ -737,11 +732,6 @@ category = "main" optional = false python-versions = ">=3.6" -[package.source] -type = "legacy" -url = "https://mirrors.aliyun.com/pypi/simple" -reference = "ali" - [[package]] name = "pygtrie" version = "2.4.2" @@ -894,7 +884,7 @@ idna2008 = ["idna"] [[package]] name = "rich" -version = "12.4.3" +version = "12.4.4" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" category = "main" optional = false @@ -908,11 +898,6 @@ typing-extensions = {version = ">=4.0.0,<5.0", markers = "python_version < \"3.9 [package.extras] jupyter = ["ipywidgets (>=7.5.1,<8.0.0)"] -[package.source] -type = "legacy" -url = "https://mirrors.aliyun.com/pypi/simple" -reference = "ali" - [[package]] name = "rsa" version = "4.8" @@ -1200,7 +1185,7 @@ python-versions = "*" [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "c3c182bd82d45cbbc3518ea79ce8c280844a01f002bc908b61624e75d1799ece" +content-hash = "76eab4291b3c2189faf8ee730ad3363111cf377797b803bed0f36394a12d4974" [metadata.files] aiofiles = [ @@ -2118,8 +2103,8 @@ rfc3986 = [ {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"}, ] rich = [ - {file = "rich-12.4.3-py3-none-any.whl", hash = "sha256:26ef784599a9ab905ade34ff28904e4fbe9bce16e02c33c78b0229551104c146"}, - {file = "rich-12.4.3.tar.gz", hash = "sha256:e7550ca19aec51b216ae4c34bfce82e94a0c79bdbf95cafbf42f343d0fb3f45a"}, + {file = "rich-12.4.4-py3-none-any.whl", hash = "sha256:d2bbd99c320a2532ac71ff6a3164867884357da3e3301f0240090c5d2fdac7ec"}, + {file = "rich-12.4.4.tar.gz", hash = "sha256:4c586de507202505346f3e32d1363eb9ed6932f0c2f63184dea88983ff4971e2"}, ] rsa = [ {file = "rsa-4.8-py3-none-any.whl", hash = "sha256:95c5d300c4e879ee69708c428ba566c59478fd653cc3a22243eeb8ed846950bb"}, From 0b4bacbbd145215ce26e5fb134e756fcc152bea1 Mon Sep 17 00:00:00 2001 From: yajiwa <839790708@qq.com> Date: Sun, 29 May 2022 21:57:01 +0800 Subject: [PATCH 2/2] update plugin_shop --- basic_plugins/plugin_shop/data_source.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/basic_plugins/plugin_shop/data_source.py b/basic_plugins/plugin_shop/data_source.py index 48d9cb8b..37c959ce 100644 --- a/basic_plugins/plugin_shop/data_source.py +++ b/basic_plugins/plugin_shop/data_source.py @@ -71,6 +71,11 @@ async def install_plugin(name: str) -> str: os.system( f"poetry run pip install -r {(extensive_plugin_path / f'{name}' / 'pyproject.toml').absolute()}" ) + elif "requirements.txt" in os.listdir(extensive_plugin_path / f"{name}"): + tmp = "检测到该插件含有额外依赖,当前安装无法保证依赖完全安装成功。" + os.system( + f"poetry run pip install -r {(extensive_plugin_path / f'{name}' / 'requirements.txt').absolute()}" + ) with open(extensive_plugin_path / f'{name}' / "plugin_info.json", 'w') as f: json.dump(data[name], f, ensure_ascii=False, indent=4) logger.debug("移动插件文件夹完成...")