diff --git a/bk-plugin-framework/poetry.lock b/bk-plugin-framework/poetry.lock index 6210cd1..dc12237 100644 --- a/bk-plugin-framework/poetry.lock +++ b/bk-plugin-framework/poetry.lock @@ -22,17 +22,17 @@ vine = ">=1.1.3,<5.0.0a1" [[package]] name = "apigw-manager" -version = "1.1.7" -description = "" +version = "3.1.1" +description = "The SDK for managing blueking gateway resource." category = "main" optional = false -python-versions = ">=3.6.1,<4.0.0" +python-versions = "<4.0.0,>=3.6.1" [package.dependencies] -bkapi-bk-apigateway = ">=1.0.6,<2.0.0" -bkapi-client-core = ">=1.1.3" -future = "0.18.2" -packaging = ">=21.0" +bkapi-bk-apigateway = ">=1.0.11,<2.0.0" +bkapi-client-core = ">=1.2.0" +future = ">=0.18.2" +packaging = ">=20.4" pyyaml = ">=5.4.1" urllib3 = ">=1.25.3" @@ -40,6 +40,7 @@ urllib3 = ">=1.25.3" cryptography = ["cryptography (>=3.1.1)", "pyjwt (>=1.6.4)"] demo = ["Django (>=1.11.1)", "PyMySQL (>=1.0.2,<2.0.0)", "django-environ (>=0.8.1)", "pyjwt (>=1.6.4)"] django = ["Django (>=1.11.1)", "pyjwt (>=1.6.4)"] +drf = ["Django (>=1.11.1)", "cryptography (>=3.1.1)", "djangorestframework (<=3.15.1)", "drf-spectacular (<=0.27.1)", "pyjwt (>=1.6.4)"] kubernetes = ["kubernetes"] [[package]] @@ -128,7 +129,7 @@ python-versions = "*" [[package]] name = "bk-plugin-runtime" -version = "2.0.7" +version = "2.0.8" description = "bk plugin python django runtime" category = "main" optional = false @@ -147,6 +148,7 @@ djangorestframework = ">=3.12.4,<4.0.0" drf-yasg = ">=1.20.0,<2.0.0" gunicorn = ">=19.6.0" protobuf = ">=3.19.4,<4.0" +pymysql = ">=1,<2" raven = ">=6.5.0,<7.0.0" redis = ">=2.10.5,<6" @@ -219,7 +221,7 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"] [[package]] name = "blueapps" -version = "4.9.1" +version = "4.14.0" description = "development framework for blueking" category = "main" optional = false @@ -228,11 +230,10 @@ python-versions = "*" [package.dependencies] bkoauth = ">=0.0.12" cryptography = ">=2.7" -Django = ">=2.2.6,<4.0.0" +Django = ">=2.2.6,<5.0.0" django-prometheus = {version = ">=2.1.0,<3.0.0", optional = true, markers = "extra == \"opentelemetry\""} Mako = ">=1.0.6,<2.0" -MarkupSafe = ">=1.1.1,<2.0.0" -mysqlclient = ">=1.4.4,<3" +MarkupSafe = ">=1.1.1,<3.0.0" opentelemetry-api = {version = ">=1.6.2,<2.0.0", optional = true, markers = "extra == \"opentelemetry\""} opentelemetry-exporter-jaeger = {version = ">=1.6.2,<2.0.0", optional = true, markers = "extra == \"opentelemetry\""} opentelemetry-exporter-jaeger-proto-grpc = {version = ">=1.6.2,<2.0.0", optional = true, markers = "extra == \"opentelemetry\""} @@ -248,9 +249,10 @@ opentelemetry-instrumentation-requests = {version = ">=0.25b2,<1.0.0", optional opentelemetry-sdk = {version = ">=1.6.2,<2.0.0", optional = true, markers = "extra == \"opentelemetry\""} prometheus-client = {version = ">=0.9.0,<1.0.0", optional = true, markers = "extra == \"opentelemetry\""} pyCryptodome = ">=3.9.7" -PyJWT = ">=1.6.1,<2.0" +PyJWT = ">=1.6.1,<3.0" python-json-logger = ">=0.1.7" requests = ">=2.22.0,<3.0.0" +Werkzeug = ">=1.0.0,<3.0.0" whitenoise = ">=3.3.0,<7" [package.extras] @@ -774,14 +776,6 @@ category = "dev" optional = false python-versions = ">=3.5" -[[package]] -name = "mysqlclient" -version = "2.0.3" -description = "Python interface to MySQL" -category = "main" -optional = false -python-versions = ">=3.5" - [[package]] name = "opentelemetry-api" version = "1.12.0" @@ -1167,6 +1161,18 @@ crypto = ["cryptography (>=1.4)"] flake8 = ["flake8", "flake8-import-order", "pep8-naming"] test = ["pytest (>=4.0.1,<5.0.0)", "pytest-cov (>=2.6.0,<3.0.0)", "pytest-runner (>=4.2,<5.0.0)"] +[[package]] +name = "pymysql" +version = "1.0.2" +description = "Pure Python MySQL Driver" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.extras] +ed25519 = ["PyNaCl (>=1.4.0)"] +rsa = ["cryptography"] + [[package]] name = "pyparsing" version = "3.0.7" @@ -1468,12 +1474,14 @@ testing = ["func-timeout", "jaraco.itertools", "pytest (>=4.6)", "pytest-black ( [metadata] lock-version = "1.1" python-versions = "^3.6.1,<4.0" -content-hash = "a4d9960f478b82a0c389c82a3ceae00d3f72d6fd9e2866f1e220ee795d9a362a" +content-hash = "8d037bd44f62cc86db82630da894d00b20e3e34a1758c57c21b788efeabafa19" [metadata.files] aiocontextvars = [] amqp = [] -apigw-manager = [] +apigw-manager = [ + {file = "apigw_manager-3.1.1-py3-none-any.whl", hash = "sha256:1e893a2d0167b0d57b5131d3dd0e1009b9657a00d1c93efa86db8f76a17e32bd"}, +] appdirs = [] asgiref = [ {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, @@ -1485,15 +1493,15 @@ backoff = [] "backports.zoneinfo" = [] billiard = [] bk-plugin-runtime = [ - {file = "bk-plugin-runtime-2.0.7.tar.gz", hash = "sha256:c805028c917339701586088aa1872a0e8b927eb6a20490243995bbdf12f5d356"}, - {file = "bk_plugin_runtime-2.0.7-py3-none-any.whl", hash = "sha256:71359bae9af7ceb770dca7e55c8e177a239209780735af146863185aadae272b"}, + {file = "bk-plugin-runtime-2.0.8.tar.gz", hash = "sha256:6c4ac1c6ad4d576b51f6fee840434557466c9ca20ea8472fa47d472ffcfce497"}, + {file = "bk_plugin_runtime-2.0.8-py3-none-any.whl", hash = "sha256:dea4b8f4bd1a9edbcbb99717306d7fe6348ac4ae9d69b6cece915bc7ade98916"}, ] bkapi-bk-apigateway = [] bkapi-client-core = [] bkoauth = [] black = [] blueapps = [ - {file = "blueapps-4.9.1.tar.gz", hash = "sha256:87d020a6b1911a8d7c0c75b672ae19d2a4e3fed285d03d350e67ad7072f250a6"}, + {file = "blueapps-4.14.0.tar.gz", hash = "sha256:f3c08b0c79741004d19705199905d018e127929e655fd94b5bd009c695b414fb"}, ] celery = [] certifi = [] @@ -1536,7 +1544,6 @@ mako = [] markupsafe = [] msgpack-python = [] mypy-extensions = [] -mysqlclient = [] opentelemetry-api = [] opentelemetry-exporter-jaeger = [] opentelemetry-exporter-jaeger-proto-grpc = [] @@ -1566,6 +1573,10 @@ pycparser = [] pycryptodome = [] pydantic = [] pyjwt = [] +pymysql = [ + {file = "PyMySQL-1.0.2-py3-none-any.whl", hash = "sha256:41fc3a0c5013d5f039639442321185532e3e2c8924687abe6537de157d403641"}, + {file = "PyMySQL-1.0.2.tar.gz", hash = "sha256:816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36"}, +] pyparsing = [] pyrsistent = [] pytest = [] diff --git a/bk-plugin-framework/pyproject.toml b/bk-plugin-framework/pyproject.toml index c071a0b..3e0a7f6 100644 --- a/bk-plugin-framework/pyproject.toml +++ b/bk-plugin-framework/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "bk-plugin-framework" -version = "2.2.6" +version = "2.2.7" description = "bk plugin python framework" authors = ["Your Name "] license = "MIT" @@ -10,7 +10,7 @@ python = "^3.6.1,<4.0" pydantic = ">=1.0,<3" werkzeug = ">=2.0.0, <4.0" apigw-manager = {version = ">=1.0.6, <4", extras = ["extra"]} -bk-plugin-runtime = "2.0.7" +bk-plugin-runtime = "2.0.8" jsonschema = ">=2.5.0,<5.0.0" [tool.poetry.dev-dependencies]