From a3b6e4fc7f2c4adde1b4e4ea052408b117067111 Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Fri, 24 Jan 2020 11:52:52 -0500 Subject: [PATCH] Fixes import paths --- crc/api/file.py | 2 +- crc/api/study.py | 6 +++--- crc/api/workflow.py | 8 ++++---- crc/workflow_processor.py | 4 ++-- example_data.py | 6 +++--- tests/base_test.py | 4 ++-- tests/test_api.py | 6 +++--- tests/test_api_files.py | 4 ++-- tests/test_workflow_processor.py | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/crc/api/file.py b/crc/api/file.py index 742fa42f..85b70f82 100644 --- a/crc/api/file.py +++ b/crc/api/file.py @@ -7,7 +7,7 @@ from flask import send_file from crc import session from crc.api.common import ApiErrorSchema, ApiError -from models.file import FileModelSchema, FileModel, FileDataModel, FileType +from crc.models.file import FileModelSchema, FileModel, FileDataModel, FileType def update_file_from_request(file_model): diff --git a/crc/api/study.py b/crc/api/study.py index 8b62422e..c668dae7 100644 --- a/crc/api/study.py +++ b/crc/api/study.py @@ -2,9 +2,9 @@ from connexion import NoContent from crc import session from crc.api.common import ApiError, ApiErrorSchema -from models.study import StudyModelSchema, StudyModel -from models.workflow import WorkflowModel, WorkflowModelSchema, WorkflowSpecModel -from workflow_processor import WorkflowProcessor +from crc.models.study import StudyModelSchema, StudyModel +from crc.models.workflow import WorkflowModel, WorkflowModelSchema, WorkflowSpecModel +from crc.workflow_processor import WorkflowProcessor def all_studies(): diff --git a/crc/api/workflow.py b/crc/api/workflow.py index 384bea54..c3f90cb5 100644 --- a/crc/api/workflow.py +++ b/crc/api/workflow.py @@ -1,12 +1,12 @@ import uuid -from api.file import delete_file +from crc.api.file import delete_file from crc import session from crc.api.common import ApiError, ApiErrorSchema -from models.workflow import WorkflowModel, WorkflowModelSchema, WorkflowSpecModelSchema, WorkflowSpecModel, \ +from crc.models.workflow import WorkflowModel, WorkflowModelSchema, WorkflowSpecModelSchema, WorkflowSpecModel, \ Task, TaskSchema -from workflow_processor import WorkflowProcessor -from models.file import FileModel +from crc.workflow_processor import WorkflowProcessor +from crc.models.file import FileModel def all_specifications(): diff --git a/crc/workflow_processor.py b/crc/workflow_processor.py index e2401d0d..d1b06c69 100644 --- a/crc/workflow_processor.py +++ b/crc/workflow_processor.py @@ -9,8 +9,8 @@ from SpiffWorkflow.camunda.parser.CamundaParser import CamundaParser from SpiffWorkflow.dmn.parser.BpmnDmnParser import BpmnDmnParser from crc import session -from models.file import FileDataModel, FileModel, FileType -from models.workflow import WorkflowStatus +from crc.models.file import FileDataModel, FileModel, FileType +from crc.models.workflow import WorkflowStatus class CustomBpmnScriptEngine(BpmnScriptEngine): diff --git a/example_data.py b/example_data.py index 234eb85b..105b331e 100644 --- a/example_data.py +++ b/example_data.py @@ -3,9 +3,9 @@ import glob import os from crc import app, db, session -from models.file import FileType, FileModel, FileDataModel -from models.study import StudyModel -from models.workflow import WorkflowSpecModel +from crc.models.file import FileType, FileModel, FileDataModel +from crc.models.study import StudyModel +from crc.models.workflow import WorkflowSpecModel class ExampleDataLoader: diff --git a/tests/base_test.py b/tests/base_test.py index 5b2ddb5d..85ef953c 100644 --- a/tests/base_test.py +++ b/tests/base_test.py @@ -4,8 +4,8 @@ import json import os import unittest -from models.file import FileModel, FileDataModel -from models.workflow import WorkflowSpecModel +from crc.models.file import FileModel, FileDataModel +from crc.models.workflow import WorkflowSpecModel os.environ["TESTING"] = "true" diff --git a/tests/test_api.py b/tests/test_api.py index 276d822a..e493059a 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -2,9 +2,9 @@ import json from datetime import datetime from crc import session -from models.file import FileModel -from models.study import StudyModel, StudyModelSchema, ProtocolBuilderStatus -from models.workflow import WorkflowSpecModel, WorkflowSpecModelSchema, WorkflowModel, WorkflowStatus, \ +from crc.models.file import FileModel +from crc.models.study import StudyModel, StudyModelSchema, ProtocolBuilderStatus +from crc.models.workflow import WorkflowSpecModel, WorkflowSpecModelSchema, WorkflowModel, WorkflowStatus, \ WorkflowModelSchema, TaskSchema from tests.base_test import BaseTest diff --git a/tests/test_api_files.py b/tests/test_api_files.py index 6cc7136c..84d2d9d2 100644 --- a/tests/test_api_files.py +++ b/tests/test_api_files.py @@ -3,8 +3,8 @@ import json from datetime import datetime from crc import session -from models.file import FileModel, FileType, FileModelSchema, FileDataModel -from models.workflow import WorkflowSpecModel +from crc.models.file import FileModel, FileType, FileModelSchema, FileDataModel +from crc.models.workflow import WorkflowSpecModel from tests.base_test import BaseTest diff --git a/tests/test_workflow_processor.py b/tests/test_workflow_processor.py index 0840b353..f688f8ac 100644 --- a/tests/test_workflow_processor.py +++ b/tests/test_workflow_processor.py @@ -1,8 +1,8 @@ from crc import session -from models.file import FileModel -from models.workflow import WorkflowSpecModel, WorkflowStatus +from crc.models.file import FileModel +from crc.models.workflow import WorkflowSpecModel, WorkflowStatus from tests.base_test import BaseTest -from workflow_processor import WorkflowProcessor +from crc.workflow_processor import WorkflowProcessor class TestWorkflowProcessor(BaseTest):