From 2eee0ef4cd5b3afd053b1be0b9dfec80a292defa Mon Sep 17 00:00:00 2001 From: rolinchen Date: Tue, 19 Nov 2024 20:22:10 +0800 Subject: [PATCH] feat: update dependencies for project --- src/bk-login/bklogin/settings.py | 2 -- src/bk-login/poetry.lock | 46 +++++++++++++++---------------- src/bk-login/pyproject.toml | 2 +- src/bk-login/requirements.txt | 2 +- src/bk-login/requirements_dev.txt | 4 +-- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/bk-login/bklogin/settings.py b/src/bk-login/bklogin/settings.py index 448e11857..ca72c2be6 100644 --- a/src/bk-login/bklogin/settings.py +++ b/src/bk-login/bklogin/settings.py @@ -27,8 +27,6 @@ from django.utils.encoding import force_bytes pymysql.install_as_MySQLdb() -# Patch version info to force pass Django client check -pymysql.version_info = 1, 4, 6, "final", 0 # environ env = environ.Env() diff --git a/src/bk-login/poetry.lock b/src/bk-login/poetry.lock index a4b446670..b6caac6d6 100644 --- a/src/bk-login/poetry.lock +++ b/src/bk-login/poetry.lock @@ -1620,13 +1620,13 @@ reference = "tencent" [[package]] name = "portalocker" -version = "2.10.1" +version = "3.0.0" description = "Wraps the portalocker recipe for easy usage" optional = false python-versions = ">=3.8" files = [ - {file = "portalocker-2.10.1-py3-none-any.whl", hash = "sha256:53a5984ebc86a025552264b459b46a2086e269b21823cb572f8f28ee759e45bf"}, - {file = "portalocker-2.10.1.tar.gz", hash = "sha256:ef1bf844e878ab08aee7e40184156e1151f228f103aa5c6bd0724cc330960f8f"}, + {file = "portalocker-3.0.0-py3-none-any.whl", hash = "sha256:211916b539a0dc3c128a3d9e86893ecfefec5379c4ff684e798f0a00f99db406"}, + {file = "portalocker-3.0.0.tar.gz", hash = "sha256:21f535de2e7a82c94c130c054adb5c7421d480d5619d61073996e2f89bcb879b"}, ] [package.dependencies] @@ -2051,29 +2051,29 @@ reference = "tencent" [[package]] name = "ruff" -version = "0.5.7" +version = "0.7.4" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.5.7-py3-none-linux_armv6l.whl", hash = "sha256:548992d342fc404ee2e15a242cdbea4f8e39a52f2e7752d0e4cbe88d2d2f416a"}, - {file = "ruff-0.5.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:00cc8872331055ee017c4f1071a8a31ca0809ccc0657da1d154a1d2abac5c0be"}, - {file = "ruff-0.5.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:eaf3d86a1fdac1aec8a3417a63587d93f906c678bb9ed0b796da7b59c1114a1e"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a01c34400097b06cf8a6e61b35d6d456d5bd1ae6961542de18ec81eaf33b4cb8"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fcc8054f1a717e2213500edaddcf1dbb0abad40d98e1bd9d0ad364f75c763eea"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7f70284e73f36558ef51602254451e50dd6cc479f8b6f8413a95fcb5db4a55fc"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:a78ad870ae3c460394fc95437d43deb5c04b5c29297815a2a1de028903f19692"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9ccd078c66a8e419475174bfe60a69adb36ce04f8d4e91b006f1329d5cd44bcf"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7e31c9bad4ebf8fdb77b59cae75814440731060a09a0e0077d559a556453acbb"}, - {file = "ruff-0.5.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d796327eed8e168164346b769dd9a27a70e0298d667b4ecee6877ce8095ec8e"}, - {file = "ruff-0.5.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:4a09ea2c3f7778cc635e7f6edf57d566a8ee8f485f3c4454db7771efb692c499"}, - {file = "ruff-0.5.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:a36d8dcf55b3a3bc353270d544fb170d75d2dff41eba5df57b4e0b67a95bb64e"}, - {file = "ruff-0.5.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:9369c218f789eefbd1b8d82a8cf25017b523ac47d96b2f531eba73770971c9e5"}, - {file = "ruff-0.5.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:b88ca3db7eb377eb24fb7c82840546fb7acef75af4a74bd36e9ceb37a890257e"}, - {file = "ruff-0.5.7-py3-none-win32.whl", hash = "sha256:33d61fc0e902198a3e55719f4be6b375b28f860b09c281e4bdbf783c0566576a"}, - {file = "ruff-0.5.7-py3-none-win_amd64.whl", hash = "sha256:083bbcbe6fadb93cd86709037acc510f86eed5a314203079df174c40bbbca6b3"}, - {file = "ruff-0.5.7-py3-none-win_arm64.whl", hash = "sha256:2dca26154ff9571995107221d0aeaad0e75a77b5a682d6236cf89a58c70b76f4"}, - {file = "ruff-0.5.7.tar.gz", hash = "sha256:8dfc0a458797f5d9fb622dd0efc52d796f23f0a1493a9527f4e49a550ae9a7e5"}, + {file = "ruff-0.7.4-py3-none-linux_armv6l.whl", hash = "sha256:a4919925e7684a3f18e18243cd6bea7cfb8e968a6eaa8437971f681b7ec51478"}, + {file = "ruff-0.7.4-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:cfb365c135b830778dda8c04fb7d4280ed0b984e1aec27f574445231e20d6c63"}, + {file = "ruff-0.7.4-py3-none-macosx_11_0_arm64.whl", hash = "sha256:63a569b36bc66fbadec5beaa539dd81e0527cb258b94e29e0531ce41bacc1f20"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d06218747d361d06fd2fdac734e7fa92df36df93035db3dc2ad7aa9852cb109"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e0cea28d0944f74ebc33e9f934238f15c758841f9f5edd180b5315c203293452"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:80094ecd4793c68b2571b128f91754d60f692d64bc0d7272ec9197fdd09bf9ea"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:997512325c6620d1c4c2b15db49ef59543ef9cd0f4aa8065ec2ae5103cedc7e7"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:00b4cf3a6b5fad6d1a66e7574d78956bbd09abfd6c8a997798f01f5da3d46a05"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7dbdc7d8274e1422722933d1edddfdc65b4336abf0b16dfcb9dedd6e6a517d06"}, + {file = "ruff-0.7.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e92dfb5f00eaedb1501b2f906ccabfd67b2355bdf117fea9719fc99ac2145bc"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3bd726099f277d735dc38900b6a8d6cf070f80828877941983a57bca1cd92172"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2e32829c429dd081ee5ba39aef436603e5b22335c3d3fff013cd585806a6486a"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_i686.whl", hash = "sha256:662a63b4971807623f6f90c1fb664613f67cc182dc4d991471c23c541fee62dd"}, + {file = "ruff-0.7.4-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:876f5e09eaae3eb76814c1d3b68879891d6fde4824c015d48e7a7da4cf066a3a"}, + {file = "ruff-0.7.4-py3-none-win32.whl", hash = "sha256:75c53f54904be42dd52a548728a5b572344b50d9b2873d13a3f8c5e3b91f5cac"}, + {file = "ruff-0.7.4-py3-none-win_amd64.whl", hash = "sha256:745775c7b39f914238ed1f1b0bebed0b9155a17cd8bc0b08d3c87e4703b990d6"}, + {file = "ruff-0.7.4-py3-none-win_arm64.whl", hash = "sha256:11bff065102c3ae9d3ea4dc9ecdfe5a5171349cdd0787c1fc64761212fc9cf1f"}, + {file = "ruff-0.7.4.tar.gz", hash = "sha256:cd12e35031f5af6b9b93715d8c4f40360070b2041f81273d0527683d5708fce2"}, ] [package.source] @@ -2644,4 +2644,4 @@ reference = "tencent" [metadata] lock-version = "2.0" python-versions = ">=3.11,<3.12" -content-hash = "d160987d36b6c54990b304d54694aa0f87bf45bab63d3a8cc247069154ef152c" +content-hash = "a3ff8af4f171c813fcee83629ce5950d158a83b455cefad280e63091e06bed53" diff --git a/src/bk-login/pyproject.toml b/src/bk-login/pyproject.toml index 98d867f13..a58bb9cec 100644 --- a/src/bk-login/pyproject.toml +++ b/src/bk-login/pyproject.toml @@ -40,7 +40,7 @@ opentelemetry-instrumentation-logging = "0.46b0" bk-notice-sdk = "1.3.2" [tool.poetry.group.dev.dependencies] -ruff = "^0.5.2" +ruff = "^0.7.1" mypy = "^1.10.1" types-requests = "^2.31.0.2" pytest = "^8.3.3" diff --git a/src/bk-login/requirements.txt b/src/bk-login/requirements.txt index 104c22e81..b4495f526 100644 --- a/src/bk-login/requirements.txt +++ b/src/bk-login/requirements.txt @@ -46,7 +46,7 @@ opentelemetry-sdk==1.25.0 ; python_version >= "3.11" and python_version < "3.12" opentelemetry-semantic-conventions==0.46b0 ; python_version >= "3.11" and python_version < "3.12" opentelemetry-util-http==0.46b0 ; python_version >= "3.11" and python_version < "3.12" packaging==24.2 ; python_version >= "3.11" and python_version < "3.12" -portalocker==2.10.1 ; python_version >= "3.11" and python_version < "3.12" +portalocker==3.0.0 ; python_version >= "3.11" and python_version < "3.12" prometheus-client==0.21.0 ; python_version >= "3.11" and python_version < "3.12" protobuf==4.25.5 ; python_version >= "3.11" and python_version < "3.12" pycparser==2.22 ; python_version >= "3.11" and python_version < "3.12" diff --git a/src/bk-login/requirements_dev.txt b/src/bk-login/requirements_dev.txt index 63e8b2572..96a1eb7f8 100644 --- a/src/bk-login/requirements_dev.txt +++ b/src/bk-login/requirements_dev.txt @@ -52,7 +52,7 @@ opentelemetry-semantic-conventions==0.46b0 ; python_version >= "3.11" and python opentelemetry-util-http==0.46b0 ; python_version >= "3.11" and python_version < "3.12" packaging==24.2 ; python_version >= "3.11" and python_version < "3.12" pluggy==1.5.0 ; python_version >= "3.11" and python_version < "3.12" -portalocker==2.10.1 ; python_version >= "3.11" and python_version < "3.12" +portalocker==3.0.0 ; python_version >= "3.11" and python_version < "3.12" prometheus-client==0.21.0 ; python_version >= "3.11" and python_version < "3.12" protobuf==4.25.5 ; python_version >= "3.11" and python_version < "3.12" pycparser==2.22 ; python_version >= "3.11" and python_version < "3.12" @@ -67,7 +67,7 @@ python-editor==1.0.4 ; python_version >= "3.11" and python_version < "3.12" python-json-logger==2.0.7 ; python_version >= "3.11" and python_version < "3.12" pywin32==308 ; python_version >= "3.11" and python_version < "3.12" and platform_system == "Windows" requests==2.32.3 ; python_version >= "3.11" and python_version < "3.12" -ruff==0.5.7 ; python_version >= "3.11" and python_version < "3.12" +ruff==0.7.4 ; python_version >= "3.11" and python_version < "3.12" sentry-sdk==1.43.0 ; python_version >= "3.11" and python_version < "3.12" setuptools==75.5.0 ; python_version >= "3.11" and python_version < "3.12" six==1.16.0 ; python_version >= "3.11" and python_version < "3.12"