From 356e898ffa46f88d415307ae2c28689d09af91db Mon Sep 17 00:00:00 2001 From: "masaya.suzuki" Date: Sat, 5 Nov 2022 12:36:32 +0900 Subject: [PATCH] =?UTF-8?q?pipenv=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=922022.10.25=E3=81=A7=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- scripts/pr_format/pr_format/install_pipenv.sh | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index d4a1b172a6..294e4848ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY Pipfile Pipfile # * libopencv-dev, libgl1-mesa-dev, libglib2.0-0: OpenCV RUN apt-get update && \ apt-get install -y --no-install-recommends git gcc libc6-dev libopencv-dev libgl1-mesa-dev libglib2.0-0 curl && \ - pip install pipenv==2022.11.4 --no-cache-dir && \ + pip install pipenv==2022.10.25 --no-cache-dir && \ if [ "${ENV}" = 'dev' ]; then \ pipenv install --system --skip-lock --dev; \ else \ diff --git a/scripts/pr_format/pr_format/install_pipenv.sh b/scripts/pr_format/pr_format/install_pipenv.sh index 71553e16dc..d25f966803 100755 --- a/scripts/pr_format/pr_format/install_pipenv.sh +++ b/scripts/pr_format/pr_format/install_pipenv.sh @@ -12,14 +12,14 @@ fi pip install ${package_name_with_version} -if [ -f ${file_name} ]; then - new_version="$(pip list --outdated | grep pipenv || true)" - new_version="$(echo -e "${new_version}" | awk '{print $3}')" - if [ -n "${new_version}" ]; then - PATTERN_BEFORE="${package_name}[^ ]+" - PATTERN_AFTER="${package_name}==${new_version}" - sed -i -E "s/${PATTERN_BEFORE}/${PATTERN_AFTER}/g" ${file_name} - pip install "${package_name}==${new_version}" - exit 1 - fi -fi +#if [ -f ${file_name} ]; then +# new_version="$(pip list --outdated | grep pipenv || true)" +# new_version="$(echo -e "${new_version}" | awk '{print $3}')" +# if [ -n "${new_version}" ]; then +# PATTERN_BEFORE="${package_name}[^ ]+" +# PATTERN_AFTER="${package_name}==${new_version}" +# sed -i -E "s/${PATTERN_BEFORE}/${PATTERN_AFTER}/g" ${file_name} +# pip install "${package_name}==${new_version}" +# exit 1 +# fi +#fi