Skip to content

Commit 4bc1fee

Browse files
committed
feat: 基础依赖调整 --story=119806440
1 parent b8d873d commit 4bc1fee

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

requirements.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Base
22
Django==3.2.25
3-
PyMySQL==0.6.7
4-
mysqlclient==2.0.3
3+
pymysql==1.0.2
54
requests==2.27.1
65
httplib2==0.19.0
76
Mako==1.1.4
@@ -59,7 +58,7 @@ importlib-metadata==3.7.3
5958
protobuf==3.19.4
6059

6160
# blueapps
62-
blueapps[opentelemetry,bkcrypto]==4.13.1
61+
blueapps[opentelemetry,bkcrypto]==4.14.0
6362
whitenoise==5.2.0
6463
raven==6.5.0
6564
python-json-logger==2.0.1

settings.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,27 @@
1717

1818
import os
1919

20+
import pymysql
21+
22+
pymysql.install_as_MySQLdb()
23+
2024
# V3判断环境的环境变量为BKPAAS_ENVIRONMENT
21-
if 'BKPAAS_ENVIRONMENT' in os.environ:
22-
ENVIRONMENT = os.getenv('BKPAAS_ENVIRONMENT', 'dev')
25+
if "BKPAAS_ENVIRONMENT" in os.environ:
26+
ENVIRONMENT = os.getenv("BKPAAS_ENVIRONMENT", "dev")
2327
# V2判断环境的环境变量为BK_ENV
2428
else:
25-
PAAS_V2_ENVIRONMENT = os.environ.get('BK_ENV', 'development')
29+
PAAS_V2_ENVIRONMENT = os.environ.get("BK_ENV", "development")
2630
ENVIRONMENT = {
27-
'development': 'dev',
28-
'testing': 'stag',
29-
'production': 'prod',
31+
"development": "dev",
32+
"testing": "stag",
33+
"production": "prod",
3034
}.get(PAAS_V2_ENVIRONMENT)
31-
DJANGO_CONF_MODULE = 'config.{env}'.format(env=ENVIRONMENT)
35+
DJANGO_CONF_MODULE = "config.{env}".format(env=ENVIRONMENT)
3236

3337
try:
34-
_module = __import__(DJANGO_CONF_MODULE, globals(), locals(), ['*'])
38+
_module = __import__(DJANGO_CONF_MODULE, globals(), locals(), ["*"])
3539
except ImportError as e:
36-
raise ImportError("Could not import config '%s' (Is it on sys.path?): %s"
37-
% (DJANGO_CONF_MODULE, e))
40+
raise ImportError("Could not import config '%s' (Is it on sys.path?): %s" % (DJANGO_CONF_MODULE, e))
3841

3942
for _setting in dir(_module):
4043
if _setting == _setting.upper():

0 commit comments

Comments
 (0)