Merge pull request #2812 from TencentBlueKing/develop

Develop
TencentBlueKing · Sep 27, 2024 · 7e7cfb3 · 7e7cfb3
2 parents b6f6e4d + 9056565
commit 7e7cfb3
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 19 deletions.
diff --git a/saas/VERSION b/saas/VERSION
@@ -1 +1 @@
-1.10.34
+1.10.35
diff --git a/saas/config/default.py b/saas/config/default.py
@@ -12,8 +12,12 @@
 import os
 
 import environ
+import pymysql
 from celery.schedules import crontab
 
+# connect mysql
+pymysql.install_as_MySQLdb()
+
 # environ
 env = environ.Env()
 

diff --git a/saas/poetry.lock b/saas/poetry.lock
diff --git a/saas/pyproject.toml b/saas/pyproject.toml
@@ -78,7 +78,7 @@ license = "MIT License"
 python = "3.6.6"
 # blueapps requirement
 Django = "3.2.25"
-mysqlclient = "2.0.1"
+pymysql = "1.0.2"
 MarkupSafe = "2.0.1"
 requests = "2.27.1"
 celery = "5.1.2"

diff --git a/saas/requirements.txt b/saas/requirements.txt
@@ -64,7 +64,6 @@ itypes==1.2.0; python_version >= "3.6"
 jinja2==3.0.3; python_version >= "3.6"
 kombu==5.1.0; python_version >= "3.6"
 markupsafe==2.0.1; python_version >= "3.6"
-mysqlclient==2.0.1; python_version >= "3.5"
 openpyxl==3.0.9; python_version >= "3.6"
 opentelemetry-api==1.8.0; python_version >= "3.6"
 opentelemetry-exporter-jaeger-proto-grpc==1.7.1; python_version >= "3.6"
@@ -96,6 +95,7 @@ pydantic==1.9.2; python_full_version >= "3.6.1"
 pyinstrument-cext==0.2.4
 pyinstrument==3.1.3
 pyjwt==1.7.1
+pymysql==1.0.2; python_version >= "3.6"
 pyparsing==2.4.7; python_full_version >= "3.6.1" and python_full_version < "4.0.0" and python_version >= "3.6"
 python-crontab==2.6.0
 python-dateutil==2.8.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0"

diff --git a/saas/requirements_dev.txt b/saas/requirements_dev.txt
@@ -84,7 +84,6 @@ mccabe==0.6.1; python_version >= "3.6" and python_full_version < "3.0.0" or pyth
 mock==1.0.1
 mypy-extensions==0.4.3; python_full_version >= "3.6.2" and python_version >= "3.5"
 mypy==0.910; python_version >= "3.5"
-mysqlclient==2.0.1; python_version >= "3.5"
 networkx==2.5; python_version >= "3.6"
 openpyxl==3.0.9; python_version >= "3.6"
 opentelemetry-api==1.8.0; python_version >= "3.6"
@@ -123,6 +122,7 @@ pyflakes==2.3.1; python_version >= "3.6" and python_full_version < "3.0.0" or py
 pyinstrument-cext==0.2.4
 pyinstrument==3.1.3
 pyjwt==1.7.1
+pymysql==1.0.2; python_version >= "3.6"
 pyparsing==2.4.7; python_full_version >= "3.6.1" and python_full_version < "4.0.0" and python_version >= "3.6"
 pyproject-flake8==0.0.1a2
 pytest-cov==3.0.0; python_version >= "3.6"

diff --git a/saas/resources/version_log/change_log.md b/saas/resources/version_log/change_log.md
@@ -1,3 +1,11 @@
+<!-- 2024-09-27 -->
+# V1.10.35 版本更新日志
+
+### 缺陷修复
+* 使用 pymysql 替换 mysql-client
+
+---
+
 <!-- 2024-09-25 -->
 # V1.10.34 版本更新日志
 

diff --git a/saas/resources/version_log/change_log_en.md b/saas/resources/version_log/change_log_en.md
@@ -1,3 +1,11 @@
+<!-- 2024-09-27 -->
+# V1.10.35 Version Update Log
+
+### Fixes
+* Use pymysql to replace mysql-client
+
+---
+
 <!-- 2024-09-25 -->
 # V1.10.34 Version Update Log