From a84750741e71b9ecb58a4b9566ca72c16b8e9075 Mon Sep 17 00:00:00 2001 From: jasquat <2487833+jasquat@users.noreply.github.com> Date: Thu, 28 Sep 2023 15:51:48 -0400 Subject: [PATCH] updated SpiffWorkflow for depth fix (#519) Co-authored-by: jasquat --- spiffworkflow-backend/poetry.lock | 6 +++--- spiffworkflow-backend/pyproject.toml | 2 +- .../services/workflow_execution_service.py | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spiffworkflow-backend/poetry.lock b/spiffworkflow-backend/poetry.lock index 144fd332e..0ac439c2c 100644 --- a/spiffworkflow-backend/poetry.lock +++ b/spiffworkflow-backend/poetry.lock @@ -2365,8 +2365,8 @@ lxml = "*" [package.source] type = "git" url = "https://github.com/sartography/SpiffWorkflow" -reference = "temp/short-term-max-depth-fix" -resolved_reference = "56f0ba545b2c0f16a4ce7afac951fd3694fb9040" +reference = "main" +resolved_reference = "92a7fdc7c9f4afb232f95c0e2d9008049949b92d" [[package]] name = "sqlalchemy" @@ -2795,4 +2795,4 @@ tests-strict = ["codecov (==2.0.15)", "pytest (==4.6.0)", "pytest (==4.6.0)", "p [metadata] lock-version = "2.0" python-versions = ">=3.10,<3.12" -content-hash = "52d201da1a56af3fad40ecd730548993d93a45023d4a94471112adf4e9bd54b5" +content-hash = "38add9297ce0c445da94865bbdf82bb37c95b57e056ec195b3c68704236fcec5" diff --git a/spiffworkflow-backend/pyproject.toml b/spiffworkflow-backend/pyproject.toml index 6c1b9c7e0..c09bb4efc 100644 --- a/spiffworkflow-backend/pyproject.toml +++ b/spiffworkflow-backend/pyproject.toml @@ -29,7 +29,7 @@ flask-migrate = "*" flask-restful = "*" flask-simple-crypt = "^0.3.3" werkzeug = "*" -SpiffWorkflow = {git = "https://github.com/sartography/SpiffWorkflow", rev = "temp/short-term-max-depth-fix"} +SpiffWorkflow = {git = "https://github.com/sartography/SpiffWorkflow", rev = "main"} # SpiffWorkflow = {develop = true, path = "../../spiffworkflow/" } # SpiffWorkflow = {develop = true, path = "../../SpiffWorkflow/" } sentry-sdk = "^1.10" diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/workflow_execution_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/workflow_execution_service.py index d076b8b88..475c6dec4 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/workflow_execution_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/workflow_execution_service.py @@ -249,7 +249,6 @@ class TaskModelSavingDelegate(EngineStepDelegate): # but it didn't quite work in all cases, so we deleted it. you can find it in commit # 1ead87b4b496525df8cc0e27836c3e987d593dc0 if you are curious. for waiting_spiff_task in bpmn_process_instance.get_tasks( - max_depth=50000, # TODO: remove when SpiffWorkflow depth calculation is corrected state=TaskState.WAITING | TaskState.CANCELLED | TaskState.READY