chore: blue-krill v2.1.0 & some minor enhancements (TencentBlueKing#216)

Author: piglei

pyproject.toml

@@ -3,12 +3,13 @@ name = "蓝鲸 PaaS 平台 Python 工具集"
 version = "0.0.1"
 description = "BlueKing PaaS Python SDK"
 authors = ["blueking <blueking@tencent.com>"]
+package-mode = false
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<3.12"
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.1.7"
+ruff = "^0.9.7"
 
 [tool.ruff]
 line-length = 119
@@ -80,8 +81,8 @@ ignore = [
   "PERF203",
   # tryceratops: 忽略后，允许抛出异常时，使用较长的字符串作为异常信息，可能会降低异常的可使用性
   "TRY003",
-  # tryceratops: 忽略后，允许在 except 语句块中使用裸的 raise 语句，不要求必须使用 raise ... from
-  "TRY200",
+  # flake80-bugbear: 忽略后，允许在 except 语句块中使用裸的 raise 语句，不要求必须使用 raise ... from
+  "B904",
   # flake8-simplify: 忽略后，允许使用 exception: pass 语句，不要求必须用 contextlib.suppress 替换
   "SIM105",
   # flake8-simplify: 忽略后，不强制要求用三元表达式替换普通的短 if-else 语句

sdks/blue-krill/CHANGE.md

@@ -1,5 +1,11 @@
 ## Change logs
 
+### 2.1.0
+
+- Feature: improve editionctl tool in various places: debounce, conditional linking and event filtering
+- Refactor: fix ruff linter issues
+- Drop support for Python3.8 and Django 1.x
+
 ### 2.0.7
 
 - Feature: (py 3.11+) add StrStructuredEnum, IntStructuredEnum class

sdks/blue-krill/blue_krill/__init__.py

@@ -15,4 +15,4 @@
 # We undertake not to change the open source license (MIT license) applicable
 # to the current version of the project delivered to anyone in the future.
 
-__version__ = "2.0.7"
+__version__ = "2.1.0"

sdks/blue-krill/blue_krill/auth/jwt.py

@@ -54,7 +54,7 @@ class ClientJWTAuth(AuthBase):
 
     _default_expires_in = 3600
 
-    def __init__(self, auth_conf: JWTAuthConf, prefix: str = "Bearer", expires_in: int = None):
+    def __init__(self, auth_conf: JWTAuthConf, prefix: str = "Bearer", expires_in: Optional[int] = None):
         self.auth_conf = auth_conf
         self.prefix = prefix
         self.expires_in = expires_in or self._default_expires_in

sdks/blue-krill/blue_krill/data_types/enum.py

@@ -61,7 +61,7 @@ class FeatureFlagMeta(type):
     _feature_flag_fields_: Dict[str, FeatureFlagField]
 
     def __new__(mcs, cls_name: str, bases, dct: Dict):  # noqa: N804
-        _feature_flag_fields_ = {}
+        _feature_flag_fields_: Dict[str, Any] = {}
         for base in bases:
             _feature_flag_fields_.update(getattr(base, "_feature_flag_fields_", {}))
 
@@ -87,7 +87,7 @@ def __iter__(cls):
             yield feature
 
 
-class FeatureFlag(str, metaclass=FeatureFlagMeta):
+class FeatureFlag(str, metaclass=FeatureFlagMeta):  # type: ignore
     def __new__(cls, value):
         """Cast a string into a predefined feature flag."""
         for field in cls._get_feature_fields_().values():

sdks/blue-krill/blue_krill/storages/blobstore/s3.py

@@ -18,7 +18,7 @@
 import logging
 from os import PathLike
 from shutil import copyfileobj
-from typing import BinaryIO
+from typing import BinaryIO, Optional
 
 from blue_krill.storages.blobstore.base import BlobStore, SignatureType
 from blue_krill.storages.blobstore.exceptions import DownloadFailedError, ObjectAlreadyExists, UploadFailedError
@@ -56,7 +56,7 @@ def __init__(
         self.endpoint_url = endpoint_url
         self.region_name = region_name
 
-    def get_client(self, signature_version: str = None):
+    def get_client(self, signature_version: Optional[str] = None):
         return boto3.resource(
             "s3",
             aws_access_key_id=self.aws_access_key_id,

sdks/blue-krill/poetry.lock

@@ -9,7 +9,7 @@ name = "blue-krill"
 description = "Tools and common packages for blueking PaaS platform."
 requires-python = ">=3.9,<3.12"
 license = "MIT"
-version = "2.0.7"
+version = "2.1.0"
 # classifieres is dynamic because we want to create Python classifiers automatically
 dynamic = ["classifiers"]
 readme = "README.md"
@@ -54,7 +54,7 @@ celery = "^5.0.5"
 pytest = "^6.2.2"
 pytest-django = "^4.1.0"
 # mypy
-mypy = "^0.910"
+mypy = "^1.15.0"
 # install extension stubs if missing
 types-requests = "2.31.0.6"
 types-setuptools = "^57.0.0"

sdks/blue-krill/pyproject.toml

@@ -54,7 +54,9 @@ def subtask(self, *args, **kwargs):
 class BasePoller(TaskPoller):
     """Base poller using fake task"""
 
-    def query(self) -> PollingResult: ...
+    def query(self) -> PollingResult:
+        # The subclass should implement this method
+        raise NotImplementedError
 
     @classmethod
     def get_async_task(cls):

sdks/blue-krill/tests/async_utils/test_poll_task.py

@@ -107,8 +107,8 @@ def config(self, tmp_path):
             project_root=tmp_path / "project",
             editions_root=editions_root,
             editions=[
-                EditionConf(name="e1", directory="e1"),
-                EditionConf(name="e2", directory="e2"),
+                EditionConf(name="e1", rel_directory="e1"),
+                EditionConf(name="e2", rel_directory="e2"),
             ],
         )