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

bk-resource 0.4.12b0tar.gz → 0.4.13tar.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.12b0 → bk_resource-0.4.13}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bk_resource
-Version: 0.4.12b0
+Version: 0.4.13
 Summary: Bk Resource
 Home-page: https://bk.tencent.com
 Author: blueking
@@ -14,12 +14,20 @@ 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
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 ![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.12b0-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.13-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.12b0 → bk_resource-0.4.13}/bk_resource/contrib/model.py RENAMED Viewed

@@ -26,13 +26,10 @@ from rest_framework.generics import GenericAPIView
 from rest_framework.viewsets import ModelViewSet
 from bk_resource import Resource
+from bk_resource.base import Empty
 from bk_resource.utils.request import get_mock_request
-class Empty:
-    ...
 class ViewMixin(GenericAPIView):
     filter_fields = []
     search_fields = []

{bk_resource-0.4.12b0 → bk_resource-0.4.13}/bk_resource/management/finder.py RENAMED Viewed

@@ -42,9 +42,17 @@ class ResourceFinder(BaseFinder):
             app_names = set(app_names)
             app_configs = [ac for ac in app_configs if ac.name in app_names]
+        # 获取需要排除的应用列表
+        exclude_apps_env = bk_resource_settings.RESOURCE_EXCLUDE_APPS
+        exclude_apps = set()
+        if exclude_apps_env:
+            exclude_apps = set(app.strip() for app in exclude_apps_env.split(',') if app.strip())
         for app_config in app_configs:
-            self.resource_path += self.find(app_config.path, root_path=os.path.dirname(app_config.path))
-            app_path_directories.append(app_config.path)
+            # 检查当前应用是否在排除列表中
+            if app_config.name not in exclude_apps:
+                self.resource_path += self.find(app_config.path, root_path=os.path.dirname(app_config.path))
+                app_path_directories.append(app_config.path)
         for path in RESOURCE_DIRS:
             search_path = os.path.join(settings.BASE_DIR, path)

{bk_resource-0.4.12b0 → bk_resource-0.4.13}/bk_resource/settings.py RENAMED Viewed

@@ -50,6 +50,7 @@ class BkResourceSettings:
         REQUEST_BKAPI_COOKIE_FIELDS=["blueking_language", "django_language"],
         REQUEST_LANGUGAE_HEADER_KEY="blueking-language",
         RESOURCE_BULK_REQUEST_PROCESSES=None,
+        RESOURCE_EXCLUDE_APPS="",
     )
     LAZY_IMPORT_SETTINGS = (

{bk_resource-0.4.12b0 → bk_resource-0.4.13}/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.12b0 → bk_resource-0.4.13}/bk_resource.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bk_resource
-Version: 0.4.12b0
+Version: 0.4.13
 Summary: Bk Resource
 Home-page: https://bk.tencent.com
 Author: blueking
@@ -14,12 +14,20 @@ 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
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 ![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.12b0-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.13-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.12b0 → bk_resource-0.4.13}/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.12b0 → bk_resource-0.4.13}/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.12b0-brightgreen.svg)](https://github.com/TencentBlueKing/bk-resource/releases)
+[![Release Version](https://img.shields.io/badge/release-0.4.13-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.12b0 → bk_resource-0.4.13}/setup.py RENAMED Viewed

@@ -23,7 +23,7 @@ with open("readme.md") as f:
 setup(
     name="bk_resource",
-    version="0.4.12b0",
+    version="0.4.13",
     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,
 )