Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(backend): 更新依赖包 #6854 #6865

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python_code_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8==5.0.4 black=="22.3.0"
pip install flake8==7.1.1 black=="22.3.0"
- name: Lint with flake8
run: |
FLAKE8_RESULT=$(flake8 dbm-ui/backend --config=dbm-ui/backend/.flake8 || true)
Expand Down
2 changes: 2 additions & 0 deletions dbm-ui/backend/.flake8
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ exclude =
per-file-ignores =
*/__init__.py: F401,F403,F405
nginx_template.py: W605
dbm-ui/backend/db_services/mysql/remote_service/handlers.py: W605
dbm-ui/backend/flow/plugins/components/collections/mysql/filter_database_table_by_flashback_input.py: W605
max-line-length=129
max-complexity=21
format=pylint
Expand Down
2 changes: 1 addition & 1 deletion dbm-ui/backend/flow/engine/bamboo/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def hide_sensitive_data(self, copy_data: Dict):
if key == "inputs":
copy_data.pop(key)
continue
if type(value) == dict:
if isinstance(value, dict):
self.hide_sensitive_data(value)
return copy_data

Expand Down
4 changes: 2 additions & 2 deletions dbm-ui/backend/flow/engine/bamboo/scene/common/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def add_parallel_acts(self, acts_list: list):
raise Exception(_("传入的acts_list参数不合法,请检测"))

for act_info in acts_list:
if type(act_info) == SubProcess:
if isinstance(act_info, SubProcess):
acts.append(act_info)
continue
act = ServiceActivity(name=act_info["act_name"], component_code=act_info["act_component_code"])
Expand Down Expand Up @@ -246,7 +246,7 @@ def hide_sensitive_data(self, copy_data: Optional[Dict]) -> Optional[Dict]:
if key == "inputs":
copy_data.pop(key)
continue
if type(value) == dict:
if isinstance(value, dict):
self.hide_sensitive_data(value)
return copy_data

Expand Down
826 changes: 354 additions & 472 deletions dbm-ui/poetry.lock

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions dbm-ui/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["blueking"]
python = "~3.10.0"
Django = "3.2.25"
djangorestframework = "3.12.4"
PyMySQL = "1.0.2"
PyMySQL = "1.1.1"
requests = "2.31.0"
Werkzeug = "1.0.1"
celery = "5.2.2"
Expand All @@ -23,7 +23,7 @@ PyYAML = "6.0"
django-filter = "^21.1"
whitenoise = "5.2.0"
attrs = "21.2.0"
gunicorn = "19.7.1"
gunicorn = "23.0.0"
IPy = "^1.01"
python-validator = "^0.0.8"
bk-iam = "1.3.6"
Expand Down Expand Up @@ -54,23 +54,24 @@ bk-audit = "1.1.0rc0"
bk-crypto-python-sdk = "1.1.1"
django-environ = "^0.11.2"
opentelemetry-api = "1.11.0"
flake8 = "5.0.4"
opentelemetry-exporter-otlp = "1.11.0"
opentelemetry-exporter-jaeger = "1.11.0"
bk-notice-sdk = "^1.1.1"
bk-notice-sdk = "1.3.1"
protobuf = "3.19.6"
promql-parser = "0.3.3"
chardet = "^5.2.0"
django-debug-toolbar = "3.8.1"
setuptools = "^74.1.2"

[tool.poetry.dev-dependencies]
flake8 = "7.1.1"
pytest = "6.2.4"
pytest-django = "3.9.0"
mock = "3.0.5"
coverage = "4.5.3"
ipython = "8.10"
requests-mock = "1.9.3"
black = "20.8b1"
black = "22.3.0"
isort = "5.7.0"

[tool.black]
Expand All @@ -93,7 +94,7 @@ build-backend = "poetry.core.masonry.api"
[[tool.poetry.source]]
name = "tencent"
url = "https://mirrors.tencent.com/repository/pypi/tencent_pypi/simple"
secondary = true
priority = "supplemental"

[tool.pytest.ini_options]
#console_output_style = 'classic'
Expand Down
152 changes: 0 additions & 152 deletions dbm-ui/requirements.txt

This file was deleted.

Loading