diff --git a/docs/RELEASE.md b/docs/RELEASE.md index 2b15026..63c4ce8 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -5,12 +5,13 @@ **New** - 增加了 `YouQu` 最新版本的检查,如果本地执行版本不是最新的,会打印更新提示信息; +- `public` 独立发布,基础框架移除此模块,在环境部署阶段进行 `public` 模块的初始化; **Fix** - 修复 `youqu` 命令无法接收带空格的参数的问题;感谢 **[@禄烨](https://github.com/lu-xianseng)** ; - `OCR` 检测模型升级到 `V4` 之后,在识别某些文本情况下出现不能识别的问题,暂时先回滚到 `V3` ; -- 修复了不同的 `case` 目录下,但 `py` 文件的名称一样,导出(`manage.py csvctl -p2c`)数据有问题;感谢 **@赵有志**; +- 修复了不同的 `case` 目录下 `py` 文件的名称一样,导出(`manage.py csvctl -p2c`)数据错误的问题;感谢 **@赵有志**; ----------------------- diff --git a/env.sh b/env.sh index 39f6fb3..c3227c5 100644 --- a/env.sh +++ b/env.sh @@ -163,10 +163,18 @@ if [ "${requirements}" != "" ]; then pipenv run pip install -r ${requirement} done fi + +pipenv run pip install -U auto_uos --extra-index-url ${pypi_mirror} -i http://10.20.52.221:8081 --trusted-host=10.20.52.221 +pip_show=$(pipenv run pip show auto_uos | grep Location) +public_location=$(echo "${pip_show}" | cut -d ":" -f2 | python3 -c "s=input();print(s.strip())") +sudo rm -rf ${ROOT_DIR}/public +sudo cp -r ${public_location}/auto_uos ${ROOT_DIR}/public + rm -rf Pipfile echo "${python_virtualenv_path}" pipenv run pip list system_env + echo 'pipenv run python "$@"' | sudo tee /usr/bin/youqu > /dev/null 2>&1 echo "pipenv shell" | sudo tee /usr/bin/youqu-shell > /dev/null 2>&1 sudo chmod +x /usr/bin/youqu diff --git a/env_dev.sh b/env_dev.sh index d62d5af..44e8cc6 100755 --- a/env_dev.sh +++ b/env_dev.sh @@ -110,5 +110,12 @@ if [ "${requirements}" != "" ]; then sudo pip3 install -r ${requirement} done fi + +sudo pip3 install -U auto_uos --extra-index-url ${pypi_mirror} -i http://10.20.52.221:8081 --trusted-host=10.20.52.221 +pip_show=$(pip3 show auto_uos | grep Location) +public_location=$(echo "${pip_show}" | cut -d ":" -f2 | python3 -c "s=input();print(s.strip())") +sudo rm -rf ${ROOT_DIR}/public +sudo cp -r ${public_location}/auto_uos ${ROOT_DIR}/public + system_env cd ${ROOT_DIR};python3 manage.py run -h diff --git a/pytest.ini b/pytest.ini index 477e0e3..dd7175a 100644 --- a/pytest.ini +++ b/pytest.ini @@ -2,7 +2,7 @@ addopts = -s -vv - --durations=3 +; --durations=3 --no-header --verbosity=2 --show-capture=no