feat: 使用 uv 来安装对应版本的 Python

nonebot · Dec 8, 2024 · 2d8485b · 2d8485b
1 parent 12b3adc
commit 2d8485b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/providers/constants.py b/src/providers/constants.py
@@ -33,4 +33,4 @@
 # 商店测试镜像
 # https://github.com/orgs/nonebot/packages/container/package/nonetest
 DOCKER_IMAGES_VERSION = os.environ.get("DOCKER_IMAGES_VERSION") or "latest"
-DOCKER_IMAGES = f"ghcr.io/nonebot/nonetest:{{}}-{DOCKER_IMAGES_VERSION}"
+DOCKER_IMAGES = f"ghcr.io/nonebot/nonetest:{DOCKER_IMAGES_VERSION}"
diff --git a/src/providers/docker_test/__init__.py b/src/providers/docker_test/__init__.py
@@ -59,20 +59,21 @@ async def run(self, version: str) -> DockerTestResult:
         Returns:
             DockerTestResult: 测试结果
         """
-        image_name = DOCKER_IMAGES.format(version)
         # 连接 Docker 环境
         client = docker.DockerClient(base_url="unix://var/run/docker.sock")
 
         try:
             # 运行 Docker 容器，捕获输出。 容器内运行的代码拥有超时设限，此处无需设置超时
             output = client.containers.run(
-                image_name,
+                DOCKER_IMAGES,
                 environment={
                     "PROJECT_LINK": self.project_link,
                     "MODULE_NAME": self.module_name,
                     "PLUGIN_CONFIG": self.config,
                     # 插件测试需要用到的插件列表来验证插件依赖是否正确加载
                     "PLUGINS_URL": REGISTRY_PLUGINS_URL,
+                    # 运行测试的 Python 版本
+                    "PYTHON_VERSION": version,
                 },
                 detach=False,
                 remove=True,

diff --git a/src/providers/docker_test/plugin_test.py b/src/providers/docker_test/plugin_test.py
@@ -224,14 +224,20 @@ def parse_requirements(requirements: str) -> dict[str, str]:
 
 class PluginTest:
     def __init__(
-        self, project_link: str, module_name: str, config: str | None = None
+        self,
+        python_version: str,
+        project_link: str,
+        module_name: str,
+        config: str | None = None,
     ) -> None:
         """插件测试构造函数
 
         Args:
             project_info (str): 项目信息，格式为 project_link:module_name
             config (str | None, optional): 插件配置. 默认为 None.
         """
+        self.python_version = python_version
+
         self.project_link = project_link
         self.module_name = module_name
         self.config = config
@@ -343,7 +349,7 @@ async def create_poetry_project(self):
             self._test_dir.mkdir()
 
             code, stdout, stderr = await self.command(
-                f"""poetry init -n && sed -i "s/\\^/~/g" pyproject.toml && poetry env info --ansi && poetry add {self.project_link}"""
+                f"""uv venv --python {self.python_version} && poetry init -n --python "~{self.python_version}" && poetry env info --ansi && poetry add {self.project_link}"""
             )
 
             self._create = code
@@ -481,11 +487,13 @@ def main():
     MODULE_NAME 为插件的模块名
     PLUGIN_CONFIG 即为该插件的配置
     """
+    python_version = os.environ.get("PYTHON_VERSION", "3.12")
+
     project_link = os.environ.get("PROJECT_LINK", "")
     module_name = os.environ.get("MODULE_NAME", "")
     plugin_config = os.environ.get("PLUGIN_CONFIG", None)
 
-    plugin = PluginTest(project_link, module_name, plugin_config)
+    plugin = PluginTest(python_version, project_link, module_name, plugin_config)
 
     asyncio.run(plugin.run())