Skip to content

Commit 0cf8124

Browse files
authored
feat: release bk-plugin-framework 2.2.4 (#76)
* feat: release bk-plugin-framework 2.2.4 * minor: update poetry.lock
1 parent 9f094d6 commit 0cf8124

7 files changed

Lines changed: 69 additions & 48 deletions

File tree

bk-plugin-framework/bk_plugin_framework/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
specific language governing permissions and limitations under the License.
1111
"""
1212

13-
__version__ = "2.2.3"
13+
__version__ = "2.2.4"

bk-plugin-framework/bk_plugin_framework/envs.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
import hashlib
1515
import logging
1616

17-
from pydantic import BaseSettings
17+
try:
18+
from pydantic.v1 import BaseSettings
19+
except ImportError:
20+
from pydantic import BaseSettings
1821
from django.conf import settings as default_settings
1922

2023
logger = logging.getLogger("bk_plugin")

bk-plugin-framework/bk_plugin_framework/kit/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
specific language governing permissions and limitations under the License.
1111
"""
1212

13-
from pydantic import Field # noqa
13+
try:
14+
from pydantic.v1 import Field
15+
except ImportError:
16+
from pydantic import Field # noqa
1417
from bk_plugin_framework.kit.plugin import ( # noqa
1518
Plugin,
1619
InputsModel,

bk-plugin-framework/bk_plugin_framework/kit/plugin.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
import typing
1515
import inspect
1616

17-
from pydantic import BaseModel
17+
try:
18+
from pydantic.v1 import BaseModel
19+
except ImportError:
20+
from pydantic import BaseModel
1821

1922
from bk_plugin_framework.hub import VersionHub
2023
from bk_plugin_framework.constants import State

bk-plugin-framework/bk_plugin_framework/runtime/executor.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
import logging
1616

1717
from celery import current_app
18-
from pydantic import ValidationError
18+
19+
try:
20+
from pydantic.v1 import ValidationError
21+
except ImportError:
22+
from pydantic import ValidationError
1923
from django.utils.timezone import now
2024

2125
from bk_plugin_framework.kit import Plugin, Context, State, InputsModel, ContextRequire, Callback

bk-plugin-framework/poetry.lock

Lines changed: 47 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bk-plugin-framework/pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[tool.poetry]
22
name = "bk-plugin-framework"
3-
version = "2.2.3"
3+
version = "2.2.4"
44
description = "bk plugin python framework"
55
authors = ["Your Name <you@example.com>"]
66
license = "MIT"
77

88
[tool.poetry.dependencies]
99
python = "^3.6.1,<4.0"
10-
pydantic = "^1.0"
11-
werkzeug = "^2.0.0"
10+
pydantic = ">=1.0,<3"
11+
werkzeug = ">=2.0.0, <4.0"
1212
apigw-manager = {version = ">=1.0.6, <1.2.0", extras = ["extra"]}
13-
bk-plugin-runtime = "2.0.6"
13+
bk-plugin-runtime = "2.0.7"
1414
jsonschema = ">=2.5.0,<5.0.0"
1515

1616
[tool.poetry.dev-dependencies]

0 commit comments

Comments
 (0)