From 71815637ccdecfa9b6853ef6f4fae95f9a1e46d1 Mon Sep 17 00:00:00 2001 From: Aurelius84 Date: Fri, 27 Nov 2020 13:01:31 +0800 Subject: [PATCH] Move gym into unittest/requirements.txt (#29149) --- paddle/scripts/paddle_build.bat | 1 - paddle/scripts/paddle_build.sh | 7 ------- python/unittest_py/requirements.txt | 1 + 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat index 7936cf98c7e..f61374ca48c 100644 --- a/paddle/scripts/paddle_build.bat +++ b/paddle/scripts/paddle_build.bat @@ -115,7 +115,6 @@ where python where pip pip install --upgrade pip --user pip install wheel --user -pip install gym --user pip install -U -r %work_dir%\python\requirements.txt --user pip install -U -r %work_dir%\python\unittest_py\requirements.txt --user if %ERRORLEVEL% NEQ 0 ( diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh index a4da883729e..1c6e6e4f3bf 100755 --- a/paddle/scripts/paddle_build.sh +++ b/paddle/scripts/paddle_build.sh @@ -67,9 +67,6 @@ function cmake_base() { # Delete previous built whl packages rm -rf python/dist 2>/dev/null || true - # `gym` is only used in unittest, it's not suitable to add in requirements.txt. - # Add it dynamically. - echo "gym" >> ${PADDLE_ROOT}/python/requirements.txt # Support build for all python versions, currently # including cp27-cp27m and cp27-cp27mu. PYTHON_FLAGS="" @@ -137,8 +134,6 @@ function cmake_base() { exit 1 fi fi - # delete `gym` to avoid modifying requirements.txt in *.whl - sed -i .bak "/^gym$/d" ${PADDLE_ROOT}/python/requirements.txt else if [ "$1" != "" ]; then echo "using python abi: $1" @@ -202,8 +197,6 @@ function cmake_base() { else pip install -r ${PADDLE_ROOT}/python/requirements.txt fi - # delete `gym` to avoid modifying requirements.txt in *.whl - sed -i "/^gym$/d" ${PADDLE_ROOT}/python/requirements.txt fi if [ "$SYSTEM" == "Darwin" ]; then diff --git a/python/unittest_py/requirements.txt b/python/unittest_py/requirements.txt index 5ba16da1ab2..2b728ae26cb 100644 --- a/python/unittest_py/requirements.txt +++ b/python/unittest_py/requirements.txt @@ -2,6 +2,7 @@ PyGithub coverage pycrypto ; platform_system != "Windows" mock +gym opencv-python<=4.2.0.32 visualdl ; python_version>="3.5" paddle2onnx>=0.4 -- GitLab