From 0de2676f9a8eddf7ede3a09d9598d2ef41c3ff66 Mon Sep 17 00:00:00 2001 From: Jon Herron Date: Mon, 3 Oct 2022 21:52:19 -0400 Subject: [PATCH] Reworking imports after empty __init__.py --- poetry.lock | 2 +- src/spiffworkflow_backend/routes/process_api_blueprint.py | 4 ++-- src/spiffworkflow_backend/scripts/fact_service.py | 2 +- src/spiffworkflow_backend/scripts/get_env.py | 2 +- src/spiffworkflow_backend/scripts/script.py | 2 +- .../services/process_instance_processor.py | 6 +++--- .../services/script_unit_test_runner.py | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/poetry.lock b/poetry.lock index 41f2b408..171cc3c2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1827,7 +1827,7 @@ test = ["pytest"] [[package]] name = "SpiffWorkflow" version = "1.1.7" -description = "" +description = "A workflow framework and BPMN/DMN Processor" category = "main" optional = false python-versions = "*" diff --git a/src/spiffworkflow_backend/routes/process_api_blueprint.py b/src/spiffworkflow_backend/routes/process_api_blueprint.py index f13240df..e13254c3 100644 --- a/src/spiffworkflow_backend/routes/process_api_blueprint.py +++ b/src/spiffworkflow_backend/routes/process_api_blueprint.py @@ -23,8 +23,8 @@ from flask_bpmn.api.api_error import ApiError from flask_bpmn.models.db import db from lxml import etree # type: ignore from lxml.builder import ElementMaker # type: ignore -from SpiffWorkflow import Task as SpiffTask # type: ignore -from SpiffWorkflow import TaskState +from SpiffWorkflow.task import Task as SpiffTask # type: ignore +from SpiffWorkflow.task import TaskState from sqlalchemy import desc from spiffworkflow_backend.exceptions.process_entity_not_found_error import ( diff --git a/src/spiffworkflow_backend/scripts/fact_service.py b/src/spiffworkflow_backend/scripts/fact_service.py index 4fb84a60..ea585d2a 100644 --- a/src/spiffworkflow_backend/scripts/fact_service.py +++ b/src/spiffworkflow_backend/scripts/fact_service.py @@ -2,7 +2,7 @@ from typing import Any from typing import Optional -from SpiffWorkflow import Task as SpiffTask # type: ignore +from SpiffWorkflow.task import Task as SpiffTask # type: ignore from spiffworkflow_backend.scripts.script import Script diff --git a/src/spiffworkflow_backend/scripts/get_env.py b/src/spiffworkflow_backend/scripts/get_env.py index 6d69e361..310bcdec 100644 --- a/src/spiffworkflow_backend/scripts/get_env.py +++ b/src/spiffworkflow_backend/scripts/get_env.py @@ -2,7 +2,7 @@ from typing import Any from typing import Optional -from SpiffWorkflow import Task as SpiffTask # type: ignore +from SpiffWorkflow.task import Task as SpiffTask # type: ignore from spiffworkflow_backend.scripts.script import Script diff --git a/src/spiffworkflow_backend/scripts/script.py b/src/spiffworkflow_backend/scripts/script.py index 16cc9b2c..f36e4ace 100644 --- a/src/spiffworkflow_backend/scripts/script.py +++ b/src/spiffworkflow_backend/scripts/script.py @@ -9,7 +9,7 @@ from typing import Any from typing import Callable from flask_bpmn.api.api_error import ApiError -from SpiffWorkflow import Task as SpiffTask # type: ignore +from SpiffWorkflow.task import Task as SpiffTask # type: ignore # Generally speaking, having some global in a flask app is TERRIBLE. # This is here, because after loading the application this will never change under diff --git a/src/spiffworkflow_backend/services/process_instance_processor.py b/src/spiffworkflow_backend/services/process_instance_processor.py index 8ec69e72..da227f5c 100644 --- a/src/spiffworkflow_backend/services/process_instance_processor.py +++ b/src/spiffworkflow_backend/services/process_instance_processor.py @@ -16,9 +16,9 @@ from flask import current_app from flask_bpmn.api.api_error import ApiError from flask_bpmn.models.db import db from lxml import etree # type: ignore -from SpiffWorkflow import Task as SpiffTask # type: ignore -from SpiffWorkflow import TaskState -from SpiffWorkflow import WorkflowException +from SpiffWorkflow.task import Task as SpiffTask # type: ignore +from SpiffWorkflow.task import TaskState +from SpiffWorkflow.exceptions import WorkflowException from SpiffWorkflow.bpmn.exceptions import WorkflowTaskExecException # type: ignore from SpiffWorkflow.bpmn.parser.ValidationException import ValidationException # type: ignore from SpiffWorkflow.bpmn.PythonScriptEngine import Box # type: ignore diff --git a/src/spiffworkflow_backend/services/script_unit_test_runner.py b/src/spiffworkflow_backend/services/script_unit_test_runner.py index b9756050..90ea705c 100644 --- a/src/spiffworkflow_backend/services/script_unit_test_runner.py +++ b/src/spiffworkflow_backend/services/script_unit_test_runner.py @@ -6,7 +6,7 @@ from dataclasses import dataclass from typing import Any from typing import Optional -from SpiffWorkflow import Task as SpiffTask # type: ignore +from SpiffWorkflow.task import Task as SpiffTask # type: ignore from SpiffWorkflow.bpmn.exceptions import WorkflowTaskExecException # type: ignore from spiffworkflow_backend.services.process_instance_processor import (