merge with main

This commit is contained in:
danfunk 2023-05-12 10:16:11 -04:00
commit 1ee3848545
2 changed files with 3 additions and 3 deletions

View File

@ -3089,7 +3089,7 @@ lxml = "*"
type = "git" type = "git"
url = "https://github.com/sartography/SpiffWorkflow" url = "https://github.com/sartography/SpiffWorkflow"
reference = "main" reference = "main"
resolved_reference = "23d54e524db2ebfccd9a05c6f988af26179248b6" resolved_reference = "4644f2810f49127e004309f60198cf5d53d99ac5"
[[package]] [[package]]
name = "sqlalchemy" name = "sqlalchemy"

View File

@ -15,8 +15,8 @@ from urllib.parse import unquote
import sentry_sdk import sentry_sdk
from flask import current_app from flask import current_app
from flask import g from flask import g
from SpiffWorkflow.bpmn.specs.events.event_definitions import TimerEventDefinition # type: ignore from SpiffWorkflow.bpmn.specs.control import _BoundaryEventParent # type: ignore
from SpiffWorkflow.bpmn.specs.events.IntermediateEvent import _BoundaryEventParent # type: ignore from SpiffWorkflow.bpmn.specs.event_definitions import TimerEventDefinition # type: ignore
from SpiffWorkflow.task import Task as SpiffTask # type: ignore from SpiffWorkflow.task import Task as SpiffTask # type: ignore
from spiffworkflow_backend import db from spiffworkflow_backend import db