提交修改
This commit is contained in:
parent
847dea4a8e
commit
bc06a43441
|
@ -10,7 +10,7 @@ from datetime import datetime
|
||||||
# 定义公共的部分
|
# 定义公共的部分
|
||||||
path = Path(__file__)
|
path = Path(__file__)
|
||||||
etc_dir = path.parent.parent / "etc"
|
etc_dir = path.parent.parent / "etc"
|
||||||
config_file_patch = path.parent.parent / "test_config.yml"
|
config_file_patch = etc_dir / "test_config.yml"
|
||||||
|
|
||||||
|
|
||||||
# 获取配置文件
|
# 获取配置文件
|
||||||
|
|
|
@ -19,15 +19,15 @@ from schedule import every, repeat, run_pending
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# 目前支持 MySQL和Oracle两种数据库,其他的数据库需要做适配
|
# 目前支持 MySQL和Oracle两种数据库,其他的数据库需要做适配
|
||||||
DBType = "mysql"
|
DBType = DBConfig.config['DBType']
|
||||||
|
|
||||||
|
|
||||||
#获取连接信息
|
#获取连接信息
|
||||||
def get_db_info(dbtype=DBType):
|
def get_db_info(dbtype=DBType):
|
||||||
db_config = {}
|
db_config = {}
|
||||||
if dbtype == "mysql":
|
if dbtype == "MySQL":
|
||||||
db_config = DBConfig.mysql_config()
|
db_config = DBConfig.mysql_config()
|
||||||
elif dbtype == "oracle":
|
elif dbtype == "Oracle":
|
||||||
db_config = DBConfig.oracle_config()
|
db_config = DBConfig.oracle_config()
|
||||||
else:
|
else:
|
||||||
assert False ,"DBType is not support."
|
assert False ,"DBType is not support."
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#faker==4.18.0 py36
|
PyYAML==6.0.1
|
||||||
faker==19.12.0
|
faker==19.12.0
|
||||||
schedule==1.2.1
|
schedule==1.2.1
|
||||||
JayDeBeApi==1.2.3
|
JayDeBeApi==1.2.3
|
||||||
|
|
27
tox.ini
27
tox.ini
|
@ -19,35 +19,10 @@ usedevelop = True
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[testenv:devenv2]
|
|
||||||
envdir = devenv2
|
|
||||||
basepython = python2.7
|
|
||||||
usedevelop = True
|
|
||||||
|
|
||||||
|
|
||||||
[testenv:py38-release]
|
[testenv:py38-release]
|
||||||
basepython = python3.8
|
basepython = python3.8
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
|
|
||||||
commands =
|
commands =
|
||||||
{envpython} {toxinidir}/release.py {envdir} {envsitepackagesdir} {toxinidir}/build/dataCreating_v1.0.1 {toxinidir}
|
{envpython} {toxinidir}/release.py {envdir} {envsitepackagesdir} {toxinidir}/build/dataCreating_v1.0.2 {toxinidir}
|
||||||
|
|
||||||
|
|
||||||
[testenv:py310-release]
|
|
||||||
basepython = python3.10
|
|
||||||
deps =
|
|
||||||
-r{toxinidir}/requirements.txt
|
|
||||||
|
|
||||||
commands =
|
|
||||||
{envpython} {toxinidir}/release.py {envdir} {envsitepackagesdir} {toxinidir}/build/dataCreating_v1.0.1 {toxinidir}
|
|
||||||
|
|
||||||
|
|
||||||
[testenv:py27-release]
|
|
||||||
basepython = python2.7
|
|
||||||
deps =
|
|
||||||
-r{toxinidir}/requirements.txt
|
|
||||||
|
|
||||||
commands =
|
|
||||||
{envpython} {toxinidir}/release.py {envdir} {envsitepackagesdir} {toxinidir}/build/dataCreating_v1.0.1 {toxinidir}
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue