From 0ef2235a6626b5ab25d5a2b7688c25c2aab2e830 Mon Sep 17 00:00:00 2001 From: Tian jianyong <11429339@qq.com> Date: Fri, 20 Dec 2024 19:51:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E7=BD=B2=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/deploy.sh | 9 ++------- scripts/prepare_deploy.sh | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index a61ad3e..2ef145d 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -60,18 +60,13 @@ fi # Install wheel files in correct order log_info "Installing Python packages..." cd "${PROJECT_ROOT}/python" -for pkg in MarkupSafe-2.0.1*.whl Jinja2-3.0.1*.whl \ - click-8.0.1*.whl itsdangerous-2.0.1*.whl \ - Werkzeug-2.0.1*.whl Flask-2.0.1*.whl; do +for pkg in *.whl; do if [ ! -f "$pkg" ]; then log_error "Required package not found: $pkg" exit 1 fi log_info "Installing $pkg..." - pip3 install --no-index --no-deps "$pkg" || { - log_error "Failed to install $pkg" - exit 1 - } + pip3 install --no-index "$pkg" done # Verify Python packages diff --git a/scripts/prepare_deploy.sh b/scripts/prepare_deploy.sh index b9711a9..23c1628 100644 --- a/scripts/prepare_deploy.sh +++ b/scripts/prepare_deploy.sh @@ -66,7 +66,8 @@ log_info "Enabling GCC 11..." source /opt/rh/devtoolset-11/enable # Download Python3 and dependencies -repotrack python3 python3-pip python3-devel +log_info "Downloading Python3 and dependencies..." +repotrack python3 python3-pip python3-devel python3-flask python3-werkzeug python3-jinja2 # Build the project log_info "Building project..." @@ -127,7 +128,6 @@ cd "${DEPLOY_DIR}/python" # 下载所有依赖包及其依赖 pip3 download \ - --no-deps \ flask==2.0.1 werkzeug==2.0.1 click==8.0.1 \ itsdangerous==2.0.1 Jinja2==3.0.1 MarkupSafe==2.0.1