From 203391a2dba6c542a418551a315835f51e3c64f3 Mon Sep 17 00:00:00 2001 From: waylon <1158341873@qq.com> Date: Mon, 15 May 2023 10:49:28 +0800 Subject: [PATCH] minor: release V3.28.8 --- .pre-commit-config.yaml | 5 +++++ app.yml | 2 +- app_desc.yaml | 2 +- config/default.py | 19 ++++++++++--------- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d04e03d508..9ad273b602 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,6 +9,11 @@ repos: hooks: - id: black language_version: python3.6 + - repo: https://github.com/pycqa/isort + rev: 5.6.4 + hooks: + - id: isort + args: ["--profile", "black", "--filter-files"] - repo: https://github.com/pre-commit/pre-commit-hooks rev: v2.1.0 hooks: diff --git a/app.yml b/app.yml index 567497dc81..bd9df1e52f 100644 --- a/app.yml +++ b/app.yml @@ -6,7 +6,7 @@ is_use_celery: True author: 蓝鲸智云 introduction: 标准运维是通过一套成熟稳定的任务调度引擎,把在多系统间的工作整合到一个流程,助力运维实现跨系统调度自动化的SaaS应用。 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process. -version: 3.28.7 +version: 3.28.8 category: 运维工具 language_support: 中文 desktop: diff --git a/app_desc.yaml b/app_desc.yaml index e7612135b9..e376b5b2e0 100644 --- a/app_desc.yaml +++ b/app_desc.yaml @@ -1,5 +1,5 @@ spec_version: 2 -app_version: "3.28.7" +app_version: "3.28.8" app: region: default bk_app_code: bk_sops diff --git a/config/default.py b/config/default.py index 96d38f73b6..5b94da1ab1 100644 --- a/config/default.py +++ b/config/default.py @@ -11,19 +11,19 @@ specific language governing permissions and limitations under the License. """ import datetime -import sys import importlib +import sys from urllib.parse import urlparse -from django.utils.translation import ugettext_lazy as _ - -from blueapps.conf.log import get_logging_config_dict +from bamboo_engine.config import Settings as BambooSettings from blueapps.conf.default_settings import * # noqa +from blueapps.conf.log import get_logging_config_dict from blueapps.opentelemetry.utils import inject_logging_trace_info -from gcloud.exceptions import ApiRequestError +from django.utils.translation import ugettext_lazy as _ from pipeline.celery.queues import ScalableQueues -from bamboo_engine.config import Settings as BambooSettings + import env +from gcloud.exceptions import ApiRequestError # 这里是默认的 INSTALLED_APPS,大部分情况下,不需要改动 # 如果你已经了解每个默认 APP 的作用,确实需要去掉某些 APP,请去掉下面的注释,然后修改 @@ -203,7 +203,7 @@ # mako模板中: # 如果静态资源修改了以后,上线前改这个版本号即可 -STATIC_VERSION = "3.28.7" +STATIC_VERSION = "3.28.8" DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S") STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")] @@ -480,9 +480,10 @@ def _(s): from pipeline.celery.settings import * # noqa from pipeline.eri.celery import queues as eri_queues # noqa -from gcloud.taskflow3.domains.queues import PrepareAndStartTaskQueueResolver # noqa -from gcloud.taskflow3.celery import settings as taskflow3_celery_settings # noqa + from gcloud.contrib.cleaner import settings as cleaner_settings # noqa +from gcloud.taskflow3.celery import settings as taskflow3_celery_settings # noqa +from gcloud.taskflow3.domains.queues import PrepareAndStartTaskQueueResolver # noqa API_TASK_QUEUE_NAME_V2 = "api" PERIODIC_TASK_QUEUE_NAME_V2 = "periodic_task"