fix(esb): use pymysql

TencentBlueKing · Sep 24, 2024 · 2fd70ce · 2fd70ce
1 parent 02e079f
commit 2fd70ce
Show file tree

Hide file tree

Showing 5 changed files with 165 additions and 27 deletions.
diff --git a/src/esb/Dockerfile b/src/esb/Dockerfile
@@ -2,7 +2,7 @@ ARG IMAGE=python
 ARG TAG=3.6.15-slim-buster
 FROM ${IMAGE}:${TAG}
 
-RUN apt-get update && apt-get install -y libssl-dev default-libmysqlclient-dev libffi-dev \
+RUN apt-get update && apt-get install -y libssl-dev libffi-dev \
     libc6-dev build-essential vim procps
 
 ADD build /app
@@ -12,4 +12,4 @@ ARG PYPI="https://pypi.org/simple/"
 RUN pip config set global.index-url "${PYPI}"
 RUN pip install -r requirements.txt
 
-CMD ["bash", "/app/bin/start.sh"]
+CMD ["bash", "/app/bin/start.sh"]
diff --git a/src/esb/esb/requirements.txt b/src/esb/esb/requirements.txt
@@ -29,7 +29,6 @@ jinja2==2.11.3 ; python_full_version >= "3.6.2" and python_version < "3.8"
 jsonfield==2.0.1 ; python_full_version >= "3.6.2" and python_version < "3.8"
 markdown==3.3.7 ; python_full_version >= "3.6.2" and python_version < "3.8"
 markupsafe==1.1.1 ; python_full_version >= "3.6.2" and python_version < "3.8"
-mysqlclient==2.0.1 ; python_full_version >= "3.6.2" and python_version < "3.8"
 packaging==21.2 ; python_full_version >= "3.6.2" and python_version < "3.8"
 portalocker==2.7.0 ; python_full_version >= "3.6.2" and python_version < "3.8"
 prometheus-client==0.12.0 ; python_full_version >= "3.6.2" and python_version < "3.8"
@@ -38,6 +37,7 @@ pycparser==2.20 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pydantic==1.8.2 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pygments==2.1.3 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pyjwt==1.7.1 ; python_full_version >= "3.6.2" and python_version < "3.8"
+pymysql==1.0.2 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pyparsing==2.4.7 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pypi-simple==0.8.0 ; python_full_version >= "3.6.2" and python_version < "3.8"
 python-dateutil==2.8.1 ; python_full_version >= "3.6.2" and python_version < "3.8"

diff --git a/src/esb/esb/requirements_dev.txt b/src/esb/esb/requirements_dev.txt
@@ -18,7 +18,7 @@ cffi==1.15.0 ; python_full_version >= "3.6.2" and python_version < "3.8"
 cfgv==3.3.1 ; python_full_version >= "3.6.2" and python_version < "3.8"
 charset-normalizer==2.0.12 ; python_full_version >= "3.6.2" and python_version < "3.8"
 click==8.0.3 ; python_full_version >= "3.6.2" and python_version < "3.8"
-colorama==0.4.4 ; python_full_version >= "3.6.2" and python_version < "3.8" and (sys_platform == "win32" or platform_system == "Windows")
+colorama==0.4.4 ; python_full_version >= "3.6.2" and python_version < "3.8" and sys_platform == "win32" or python_full_version >= "3.6.2" and python_version < "3.8" and platform_system == "Windows"
 concurrent-log-handler==0.9.24 ; python_full_version >= "3.6.2" and python_version < "3.8"
 coverage==4.5.4 ; python_full_version >= "3.6.2" and python_version < "3.8"
 cryptography==3.4.8 ; python_full_version >= "3.6.2" and python_version < "3.8"
@@ -54,7 +54,6 @@ mock==3.0.5 ; python_full_version >= "3.6.2" and python_version < "3.8"
 more-itertools==8.10.0 ; python_full_version >= "3.6.2" and python_version < "3.8"
 mypy-extensions==0.4.3 ; python_full_version >= "3.6.2" and python_version < "3.8"
 mypy==0.910 ; python_full_version >= "3.6.2" and python_version < "3.8"
-mysqlclient==2.0.1 ; python_full_version >= "3.6.2" and python_version < "3.8"
 nodeenv==1.6.0 ; python_full_version >= "3.6.2" and python_version < "3.8"
 packaging==21.2 ; python_full_version >= "3.6.2" and python_version < "3.8"
 parso==0.8.2 ; python_full_version >= "3.6.2" and python_version < "3.8"
@@ -77,6 +76,7 @@ pydantic==1.8.2 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pyflakes==2.2.0 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pygments==2.1.3 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pyjwt==1.7.1 ; python_full_version >= "3.6.2" and python_version < "3.8"
+pymysql==1.0.2 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pyparsing==2.4.7 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pypi-simple==0.8.0 ; python_full_version >= "3.6.2" and python_version < "3.8"
 pytest-benchmark==3.2.3 ; python_full_version >= "3.6.2" and python_version < "3.8"
@@ -107,6 +107,7 @@ typed-ast==1.4.3 ; python_full_version >= "3.6.2" and python_version < "3.8"
 types-cachetools==5.3.0.5 ; python_full_version >= "3.6.2" and python_version < "3.8"
 types-chardet==5.0.4.6 ; python_full_version >= "3.6.2" and python_version < "3.8"
 types-markdown==3.4.2.9 ; python_full_version >= "3.6.2" and python_version < "3.8"
+types-pymysql==1.1.0.1 ; python_full_version >= "3.6.2" and python_version < "3.8"
 types-pyyaml==6.0.12.9 ; python_full_version >= "3.6.2" and python_version < "3.8"
 types-requests==2.30.0.0 ; python_full_version >= "3.6.2" and python_version < "3.8"
 types-urllib3==1.26.25.13 ; python_full_version >= "3.6.2" and python_version < "3.8"