Skip to content

Commit

Permalink
feat: 兼容django4.2语法
Browse files Browse the repository at this point in the history
  • Loading branch information
wencong1724427771 committed Dec 27, 2024
1 parent d109b45 commit 306b7bf
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"""

from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from pipeline.component_framework.constants import LEGACY_PLUGINS_VERSION
from pipeline.component_framework.library import ComponentLibrary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from abc import ABCMeta, abstractmethod
from copy import deepcopy

from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from pipeline.conf import settings
from pipeline.core.flow.activity.base import Activity
from pipeline.core.flow.io import (
Expand Down
2 changes: 1 addition & 1 deletion runtime/bamboo-pipeline/pipeline/core/flow/signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@

from django.dispatch import Signal

post_new_end_event_register = Signal(providing_args=["node_type", "node_cls"])
post_new_end_event_register = Signal()
2 changes: 1 addition & 1 deletion runtime/bamboo-pipeline/pipeline/core/signals/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@

from django.dispatch import Signal

pre_variable_register = Signal(providing_args=["variable_code"])
pre_variable_register = Signal()
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import pickle

from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _


class IOField(models.BinaryField):
Expand Down
2 changes: 1 addition & 1 deletion runtime/bamboo-pipeline/pipeline/engine/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"""

from django.contrib import admin
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from pipeline.engine import models
from pipeline.engine.conf.function_switch import FREEZE_ENGINE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
specific language governing permissions and limitations under the License.
"""

from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

FREEZE_ENGINE = "FREEZE_ENGINE"

Expand Down
2 changes: 1 addition & 1 deletion runtime/bamboo-pipeline/pipeline/engine/models/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

from django.db import models, transaction
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from pipeline.conf import settings as pipeline_settings
from pipeline.constants import PIPELINE_DEFAULT_PRIORITY
Expand Down
2 changes: 1 addition & 1 deletion runtime/bamboo-pipeline/pipeline/engine/models/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"""

from django.db import models, transaction
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from pipeline.engine.models.fields import IOField

Expand Down
2 changes: 1 addition & 1 deletion runtime/bamboo-pipeline/pipeline/engine/models/function.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import traceback

from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from pipeline.engine.conf import function_switch

Expand Down
32 changes: 16 additions & 16 deletions runtime/bamboo-pipeline/pipeline/engine/signals/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@

from django.dispatch import Signal

pipeline_ready = Signal(providing_args=["process_id"])
pipeline_end = Signal(providing_args=["root_pipeline_id"])
pipeline_revoke = Signal(providing_args=["root_pipeline_id"])
child_process_ready = Signal(providing_args=["child_id"])
process_ready = Signal(providing_args=["parent_id", "current_node_id", "call_from_child"])
batch_process_ready = Signal(providing_args=["process_id_list", "pipeline_id"])
wake_from_schedule = Signal(providing_args=["process_id, activity_id"])
schedule_ready = Signal(providing_args=["schedule_id", "countdown", "process_id", "data_id"])
process_unfreeze = Signal(providing_args=["process_id"])
pipeline_ready = Signal()
pipeline_end = Signal()
pipeline_revoke = Signal()
child_process_ready = Signal()
process_ready = Signal()
batch_process_ready = Signal()
wake_from_schedule = Signal()
schedule_ready = Signal()
process_unfreeze = Signal()
# activity failed signal
activity_failed = Signal(providing_args=["pipeline_id", "pipeline_activity_id", "subprocess_id_stack"])
activity_failed = Signal()

# signal for developer (do not use valve to pass them!)
service_schedule_fail = Signal(providing_args=["activity_shell", "schedule_service", "ex_data"])
service_schedule_success = Signal(providing_args=["activity_shell", "schedule_service"])
node_skip_call = Signal(providing_args=["process", "node"])
node_retry_ready = Signal(providing_args=["process", "node"])
service_schedule_fail = Signal()
service_schedule_success = Signal()
node_skip_call = Signal()
node_retry_ready = Signal()

service_activity_timeout_monitor_start = Signal(providing_args=["node_id", "version", "root_pipeline_id", "countdown"])
service_activity_timeout_monitor_end = Signal(providing_args=["node_id", "version"])
service_activity_timeout_monitor_start = Signal()
service_activity_timeout_monitor_end = Signal()
2 changes: 1 addition & 1 deletion runtime/bamboo-pipeline/pipeline/log/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

from django.db import models
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _


class LogEntryManager(models.Manager):
Expand Down
2 changes: 1 addition & 1 deletion runtime/bamboo-pipeline/pipeline/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from django.db import models, transaction
from django.utils import timezone
from django.utils.module_loading import import_string
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from pipeline.conf import settings
from pipeline.constants import PIPELINE_DEFAULT_PRIORITY
Expand Down
4 changes: 2 additions & 2 deletions runtime/bamboo-pipeline/pipeline/signals/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@

from django.dispatch import Signal

post_pipeline_finish = Signal(providing_args=["instance_id"])
post_pipeline_revoke = Signal(providing_args=["instance_id"])
post_pipeline_finish = Signal()
post_pipeline_revoke = Signal()
2 changes: 1 addition & 1 deletion runtime/bamboo-pipeline/pipeline/validators/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
specific language governing permissions and limitations under the License.
"""

from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from pipeline.exceptions import ConnectionValidateError
from pipeline.utils.graph import Graph
Expand Down
2 changes: 1 addition & 1 deletion runtime/bamboo-pipeline/pipeline/validators/gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import queue

from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from pipeline import exceptions
from pipeline.core.constants import PE
Expand Down

0 comments on commit 306b7bf

Please sign in to comment.