PyPI - bk-resource - Versions diffs - 0.4.11b0__tar.gz → 0.4.12__tar.gz - Mend

bk-resource 0.4.11b0tar.gz → 0.4.12tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (61) hide show

{bk_resource-0.4.11b0 → bk_resource-0.4.12}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bk_resource
-Version: 0.4.11b0
+Version: 0.4.12
 Summary: Bk Resource
 Home-page: https://bk.tencent.com
 Author: blueking
@@ -14,12 +14,12 @@ Requires-Dist: drf-yasg>=1.20.0
 Requires-Dist: pyinstrument>=3.4.2
 Requires-Dist: arrow>=1.2.0
 Requires-Dist: django-rest-framework-condition>=0.1.1
-Requires-Dist: celery>=5
+Requires-Dist: celery>=4.4.0
 ![logo.png](assests/logo.png)
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/TencentBlueKing/bk-resource/blob/main/LICENSE.txt)
-[![Release Version](https://img.shields.io/badge/release-0.4.11-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.12-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/pulls)
 [![codecov](https://codecov.io/gh/TencentBlueKing/bk-resource/branch/main/graph/badge.svg)](https://codecov.io/gh/TencentBlueKing/bk-resource)
 [![Unittest Py3](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml/badge.svg)](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml)

{bk_resource-0.4.11b0 → bk_resource-0.4.12}/bk_resource/contrib/model.py RENAMED Viewed

@@ -26,11 +26,8 @@ from rest_framework.generics import GenericAPIView
 from rest_framework.viewsets import ModelViewSet
 from bk_resource import Resource
-from bk_resource.utils.request import get_moke_request
-class Empty:
-    ...
+from bk_resource.base import Empty
+from bk_resource.utils.request import get_mock_request
 class ViewMixin(GenericAPIView):
@@ -63,7 +60,7 @@ class ViewMixin(GenericAPIView):
     def build_request(self, *, method: str, params: dict) -> WSGIRequest:
         # 构造虚拟请求对象
-        request = get_moke_request(REQUEST_METHOD=method)
+        request = get_mock_request(REQUEST_METHOD=method)
         # 为对应的方法添加请求体
         if request.method.lower() in ["get"]:
             setattr(request, "query_params", params)

{bk_resource-0.4.11b0 → bk_resource-0.4.12}/bk_resource/routers.py RENAMED Viewed

@@ -48,8 +48,10 @@ class ResourceRouter(DefaultRouter):
             # 全小写的属性不是类，忽略
             if attr.startswith("_") or attr[0].islower():
                 continue
-            if isinstance(viewset, type) and issubclass(viewset, GenericViewSet):
+            # viewset is not ResourceViewSet：
+            # 1. 在 DRF >= 3.15.0 版本，重复注册会抛出 ImproperlyConfigured 异常
+            # 2. 对于用户导入的 ResourceViewSet 类不需要注册
+            if isinstance(viewset, type) and issubclass(viewset, GenericViewSet) and viewset is not ResourceViewSet:
                 module_prefix = self.get_default_basename(viewset)
                 if prefix:
                     module_prefix = f"{prefix}/{module_prefix}" if module_prefix else prefix

{bk_resource-0.4.11b0 → bk_resource-0.4.12}/bk_resource/utils/cache.py RENAMED Viewed

@@ -25,7 +25,7 @@ from django.core.cache import cache, caches
 from django.utils.encoding import force_bytes
 from django.utils.translation import gettext
-from bk_resource.contrib.model import Empty
+from bk_resource.base import Empty
 from bk_resource.settings import bk_resource_settings
 from bk_resource.utils.common_utils import count_md5
 from bk_resource.utils.local import local

{bk_resource-0.4.11b0 → bk_resource-0.4.12}/bk_resource/utils/request.py RENAMED Viewed

@@ -42,5 +42,5 @@ def set_local_username(username):
     local.username = username
-def get_moke_request(**kwargs):
+def get_mock_request(**kwargs):
     return RequestFactory().request(**kwargs)

{bk_resource-0.4.11b0 → bk_resource-0.4.12}/bk_resource.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bk_resource
-Version: 0.4.11b0
+Version: 0.4.12
 Summary: Bk Resource
 Home-page: https://bk.tencent.com
 Author: blueking
@@ -14,12 +14,12 @@ Requires-Dist: drf-yasg>=1.20.0
 Requires-Dist: pyinstrument>=3.4.2
 Requires-Dist: arrow>=1.2.0
 Requires-Dist: django-rest-framework-condition>=0.1.1
-Requires-Dist: celery>=5
+Requires-Dist: celery>=4.4.0
 ![logo.png](assests/logo.png)
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/TencentBlueKing/bk-resource/blob/main/LICENSE.txt)
-[![Release Version](https://img.shields.io/badge/release-0.4.11-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.12-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/pulls)
 [![codecov](https://codecov.io/gh/TencentBlueKing/bk-resource/branch/main/graph/badge.svg)](https://codecov.io/gh/TencentBlueKing/bk-resource)
 [![Unittest Py3](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml/badge.svg)](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml)

{bk_resource-0.4.11b0 → bk_resource-0.4.12}/bk_resource.egg-info/requires.txt RENAMED Viewed

@@ -5,4 +5,4 @@ drf-yasg>=1.20.0
 pyinstrument>=3.4.2
 arrow>=1.2.0
 django-rest-framework-condition>=0.1.1
-celery>=5
+celery>=4.4.0

{bk_resource-0.4.11b0 → bk_resource-0.4.12}/readme.md RENAMED Viewed

@@ -1,7 +1,7 @@
 ![logo.png](assests/logo.png)
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/TencentBlueKing/bk-resource/blob/main/LICENSE.txt)
-[![Release Version](https://img.shields.io/badge/release-0.4.11-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.12-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/pulls)
 [![codecov](https://codecov.io/gh/TencentBlueKing/bk-resource/branch/main/graph/badge.svg)](https://codecov.io/gh/TencentBlueKing/bk-resource)
 [![Unittest Py3](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml/badge.svg)](https://github.com/TencentBlueKing/bk-resource/actions/workflows/unittest.yml)

{bk_resource-0.4.11b0 → bk_resource-0.4.12}/setup.py RENAMED Viewed

@@ -23,7 +23,7 @@ with open("readme.md") as f:
 setup(
     name="bk_resource",
-    version="0.4.11b0",
+    version="0.4.12",
     author="blueking",
     url="https://bk.tencent.com",
     author_email="blueking@tencent.com",
@@ -46,7 +46,7 @@ setup(
         "pyinstrument>=3.4.2",
         "arrow>=1.2.0",
         "django-rest-framework-condition>=0.1.1",
-        "celery>=5",
+        "celery>=4.4.0",
     ],
     include_package_data=True,
 )