diff --git a/build.sh b/build.sh index ef4ea80237a4768f94c05c29372a128595de6a8c..bfdb96883e028f23c49b5b3f10b8e22fedab6948 100755 --- a/build.sh +++ b/build.sh @@ -46,9 +46,10 @@ function npm_install() { } function first_install() { - python setup.py develop + python -m pip install setuptools wheel python -m pip install --upgrade pip - pip install setuptools wheel twine + python setup.py develop + pip install setuptools wheel pip_install pip_compile build_wheel diff --git a/docs/TODO.md b/docs/TODO.md index 26f50c02087be1e38b2b5182b1f87d4e5ae8799b..78b792bbe112094c9c49995409760d0de4c1cea6 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -5,4 +5,5 @@ * https://mariadb.com/kb/en/query-cache/ * https://docs.sqlalchemy.org/en/14/core/pooling.html * https://docs.sqlalchemy.org/en/14/core/pooling.html?highlight=disconnects#dealing-with-disconnects - +* https://mariadb-corporation.github.io/mariadb-connector-python/ +* https://mariadb.com/docs/clients/connector-python/ diff --git a/etc/TODO.md b/etc/TODO.md index 61d99a3c16729353992cf409652fb52022051f3a..30f7c22c72f610cee43047f1e6ee9f0af6d86d23 100644 --- a/etc/TODO.md +++ b/etc/TODO.md @@ -57,5 +57,3 @@ * add flask-whooshalchemy3 https://pypi.org/project/flask-whooshalchemy3/ https://github.com/blakev/Flask-WhooshAlchemy3 * add flask-filealchemy https://pypi.org/project/flask-filealchemy/ -### user security -* https://github.com/PrettyPrinted/flask_auth_scotch/ diff --git a/requirements/dev.in b/requirements/dev.in index 509a88ffc08a326516fa5855e4a914701b1a5df4..c5150daaf388eea0a08237c1ecfe3a46ec9e00e1 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -9,6 +9,9 @@ Flask-Login==0.5.0 SQLAlchemy>=1.4.5 celery[redis]>=5.0.5 mariadb==1.0.6 +mysqlclient==2.0.3 +psycopg2-binary==2.8.6 +cx-Oracle==8.1.0 wget>=3.2 pyecharts>=1.9.0 pyecharts-extras>=0.0.5 diff --git a/requirements/dev.txt b/requirements/dev.txt index b9b2f882da8d8a64063269ae0ada2fc272dbe55d..f4ff0b44c9441a853d40ea52c6b986cf790b2afe 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -62,6 +62,8 @@ cryptography==3.4.7 # via # jwcrypto # secretstorage +cx-oracle==8.1.0 + # via -r requirements/dev.in cycler==0.10.0 # via matplotlib distlib==0.3.1 @@ -193,6 +195,8 @@ more-itertools==8.0.2 # via # jaraco.functools # pytest-enabler +mysqlclient==2.0.3 + # via -r requirements/dev.in nodeenv==1.5.0 # via pre-commit numba==0.52.0 @@ -259,6 +263,8 @@ prompt-toolkit==3.0.16 # via click-repl psutil==5.8.0 # via mirakuru +psycopg2-binary==2.8.6 + # via -r requirements/dev.in ptable==0.9.2 # via pip-licenses py2puml==0.4.0