From 1daa7ffc9eb0853bfaff43c93ea794fb7fb573f0 Mon Sep 17 00:00:00 2001 From: mizhexiaoxiao <1157861072@qq.com> Date: Wed, 26 Feb 2025 16:38:32 +0800 Subject: [PATCH] Update --- Dockerfile | 3 +-- pyproject.toml | 1 + uv.lock | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca3973d..806287c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,8 +20,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core-apt \ && apt-get update \ && apt-get install -y --no-install-recommends gcc python3-dev bash nginx vim curl procps net-tools -RUN pip install uv -i https://pypi.tuna.tsinghua.edu.cn/simple \ - && uv add --requirements requirements.txt +RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple COPY --from=web /opt/vue-fastapi-admin/web/dist /opt/vue-fastapi-admin/web/dist ADD /deploy/web.conf /etc/nginx/sites-available/web.conf diff --git a/pyproject.toml b/pyproject.toml index 4381aa2..301fdbf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,6 +68,7 @@ dependencies = [ "watchfiles==1.0.4", "websockets==14.1", "pyproject-toml>=0.1.0", + "uvloop==0.21.0 ; sys_platform != 'win32'", ] [tool.black] diff --git a/uv.lock b/uv.lock index 40e9b11..f5cebfd 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,9 @@ version = 1 requires-python = ">=3.11" +resolution-markers = [ + "sys_platform != 'win32'", + "sys_platform == 'win32'", +] [[package]] name = "aerich" @@ -1083,6 +1087,7 @@ requires-dist = [ { name = "ujson", specifier = "==5.10.0" }, { name = "uvicorn", specifier = "==0.34.0" }, { name = "uvloop", specifier = "==0.21.0" }, + { name = "uvloop", marker = "sys_platform != 'win32'", specifier = "==0.21.0" }, { name = "watchfiles", specifier = "==1.0.4" }, { name = "websockets", specifier = "==14.1" }, ]