fix: remove bricks_for_python (repo 404), simplify pccs.py
This commit is contained in:
parent
b06ea9d8df
commit
bfe8397fe0
@ -7,8 +7,6 @@ import os, sys
|
|||||||
from ahserver.webapp import webapp
|
from ahserver.webapp import webapp
|
||||||
from ahserver.serverenv import ServerEnv
|
from ahserver.serverenv import ServerEnv
|
||||||
|
|
||||||
import bricks_for_python
|
|
||||||
from bricks_for_python.init import load_pybricks
|
|
||||||
from appbase.init import load_appbase
|
from appbase.init import load_appbase
|
||||||
from rbac.init import load_rbac
|
from rbac.init import load_rbac
|
||||||
|
|
||||||
@ -16,7 +14,6 @@ WORKDIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|||||||
|
|
||||||
|
|
||||||
def get_module_dbname(m):
|
def get_module_dbname(m):
|
||||||
"""所有模块共用 pccs 数据库"""
|
|
||||||
return 'pccs'
|
return 'pccs'
|
||||||
|
|
||||||
|
|
||||||
@ -28,12 +25,11 @@ def password_encode(s):
|
|||||||
|
|
||||||
|
|
||||||
def init():
|
def init():
|
||||||
env = ServerEnv() # MUST be before load_rbac
|
env = ServerEnv()
|
||||||
env.get_module_dbname = get_module_dbname
|
env.get_module_dbname = get_module_dbname
|
||||||
env.password_encode = password_encode
|
env.password_encode = password_encode
|
||||||
load_appbase()
|
load_appbase()
|
||||||
load_rbac()
|
load_rbac()
|
||||||
load_pybricks()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|||||||
4
build.sh
4
build.sh
@ -70,7 +70,7 @@ green " OK: ${VENV}"
|
|||||||
# 3: Clone/Pull
|
# 3: Clone/Pull
|
||||||
# ============================================================
|
# ============================================================
|
||||||
blue "[3/10] 同步仓库..."
|
blue "[3/10] 同步仓库..."
|
||||||
ALL=(apppublic sqlor ahserver appbase rbac bricks bricks_for_python
|
ALL=(apppublic sqlor ahserver appbase rbac bricks
|
||||||
pcpool pcc storage_mgr image_mgr pccs)
|
pcpool pcc storage_mgr image_mgr pccs)
|
||||||
for repo in "${ALL[@]}"; do
|
for repo in "${ALL[@]}"; do
|
||||||
if [ -d "${PKGDIR}/${repo}/.git" ]; then
|
if [ -d "${PKGDIR}/${repo}/.git" ]; then
|
||||||
@ -95,7 +95,7 @@ green " OK"
|
|||||||
# 4: pip install
|
# 4: pip install
|
||||||
# ============================================================
|
# ============================================================
|
||||||
blue "[4/10] 安装模块..."
|
blue "[4/10] 安装模块..."
|
||||||
MODULES=(apppublic sqlor ahserver appbase rbac bricks_for_python
|
MODULES=(apppublic sqlor ahserver appbase rbac
|
||||||
pcpool pcc storage_mgr image_mgr)
|
pcpool pcc storage_mgr image_mgr)
|
||||||
for m in "${MODULES[@]}"; do
|
for m in "${MODULES[@]}"; do
|
||||||
mp="${PKGDIR}/${m}"
|
mp="${PKGDIR}/${m}"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user