Squashed 'SpiffWorkflow/' changes from a6392d1906..8d820dce1f

8d820dce1f Track spiff step details more granularly (#17)
426da26d8f Clear the remaining __init__.py imports in SpiffWorkflow (#14)
9a1d1c484a Fix FutureWarning in SpiffWorkflow (#16)

git-subtree-dir: SpiffWorkflow
git-subtree-split: 8d820dce1f439bb76bc07e39629832d998d6f634

doc/non-bpmn/tutorial/start.py

@@ -1,6 +1,6 @@
 import json
 from SpiffWorkflow.workflow import Workflow
-from SpiffWorkflow.specs import WorkflowSpec
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.serializer.json import JSONSerializer
 
 # Load from JSON

tests/SpiffWorkflow/PatternTest.py

@@ -6,7 +6,7 @@ import unittest
 import os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
 
-from SpiffWorkflow.specs import WorkflowSpec
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.task import Task
 from SpiffWorkflow.serializer.prettyxml import XmlSerializer
 from tests.SpiffWorkflow.util import run_workflow

tests/SpiffWorkflow/PersistSmallWorkflowTest.py

@@ -6,7 +6,9 @@ import os.path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
 
 from SpiffWorkflow.workflow import Workflow
-from SpiffWorkflow.specs import Join, MultiChoice, WorkflowSpec
+from SpiffWorkflow.specs.Join import Join
+from SpiffWorkflow.specs.MultiChoice import MultiChoice
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.operators import Attrib, Equal, PathAttrib
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.specs.Simple import Simple

tests/SpiffWorkflow/TaskTest.py

@@ -7,7 +7,8 @@ import os.path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
 
 from SpiffWorkflow.task import Task, TaskState, updateDotDict
-from SpiffWorkflow.specs import WorkflowSpec, Simple
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
+from SpiffWorkflow.specs.Simple import Simple
 
 
 class MockWorkflow(object):

tests/SpiffWorkflow/WorkflowTest.py

@@ -7,7 +7,9 @@ data_dir = os.path.join(os.path.dirname(__file__), 'data')
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
 
 from SpiffWorkflow.workflow import Workflow
-from SpiffWorkflow.specs import Cancel, Simple, WorkflowSpec
+from SpiffWorkflow.specs.Cancel import Cancel
+from SpiffWorkflow.specs.Simple import Simple
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.serializer.prettyxml import XmlSerializer
 

tests/SpiffWorkflow/bpmn/ApprovalsTest.py

@@ -2,7 +2,7 @@
 
 import unittest
 from SpiffWorkflow.bpmn.workflow import BpmnWorkflow
-from SpiffWorkflow.bpmn.specs.events import MessageEventDefinition
+from SpiffWorkflow.bpmn.specs.events.event_definitions import MessageEventDefinition
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase
 
 __author__ = 'matth'

tests/SpiffWorkflow/bpmn/BpmnLoaderForTests.py

@@ -10,7 +10,7 @@ from SpiffWorkflow.bpmn.serializer.bpmn_converters import BpmnTaskSpecConverter
 
 # Many of our tests relied on the Packager to set the calledElement attribute on
 # Call Activities.  I've moved that code to a customized parser.
-from SpiffWorkflow.signavio.parser import CallActivityParser
+from SpiffWorkflow.signavio.parser.tasks import CallActivityParser
 from SpiffWorkflow.bpmn.specs.SubWorkflowTask import CallActivity
 
 __author__ = 'matth'

tests/SpiffWorkflow/bpmn/BpmnWorkflowSerializerTest.py

@@ -6,7 +6,7 @@ from uuid import uuid4
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.bpmn.PythonScriptEngine import PythonScriptEngine
 from SpiffWorkflow.bpmn.parser.BpmnParser import BpmnParser
-from SpiffWorkflow.bpmn.serializer import BpmnWorkflowSerializer
+from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer
 from SpiffWorkflow.bpmn.serializer.BpmnSerializer import BpmnSerializer
 from SpiffWorkflow.bpmn.workflow import BpmnWorkflow
 from tests.SpiffWorkflow.bpmn.BpmnLoaderForTests import TestUserTaskConverter

tests/SpiffWorkflow/bpmn/BpmnWorkflowTestCase.py

@@ -7,7 +7,7 @@ from SpiffWorkflow.bpmn.parser.BpmnParser import BpmnValidator
 
 from SpiffWorkflow.task import TaskState
 
-from SpiffWorkflow.bpmn.serializer import BpmnWorkflowSerializer
+from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer
 from .BpmnLoaderForTests import TestUserTaskConverter, TestBpmnParser
 
 __author__ = 'matth'

tests/SpiffWorkflow/bpmn/ProcessDependencyTest.py

@@ -3,7 +3,7 @@ import os
 import unittest
 
 from SpiffWorkflow.camunda.parser.CamundaParser import CamundaParser
-from SpiffWorkflow.spiff.parser import SpiffBpmnParser
+from SpiffWorkflow.spiff.parser.process import SpiffBpmnParser
 
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase
 

tests/SpiffWorkflow/bpmn/events/MultipleEventsTest.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import unittest
 
-from SpiffWorkflow.bpmn.specs.events import CancelEventDefinition, SignalEventDefinition
+from SpiffWorkflow.bpmn.specs.events.event_definitions import CancelEventDefinition, SignalEventDefinition
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.bpmn.workflow import BpmnWorkflow
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase

tests/SpiffWorkflow/bpmn/events/TimerDurationBoundaryOnTaskTest.py

@@ -5,7 +5,7 @@ import datetime
 import time
 from datetime import timedelta
 
-from SpiffWorkflow.bpmn.specs.events import EndEvent
+from SpiffWorkflow.bpmn.specs.events.EndEvent import EndEvent
 from SpiffWorkflow.task import TaskState
 from SpiffWorkflow.bpmn.workflow import BpmnWorkflow
 from SpiffWorkflow.bpmn.PythonScriptEngine import PythonScriptEngine

tests/SpiffWorkflow/camunda/BaseTestCase.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 import os
 
-from SpiffWorkflow.bpmn.serializer import BpmnWorkflowSerializer
+from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer
 from SpiffWorkflow.camunda.parser.CamundaParser import CamundaParser
-from SpiffWorkflow.camunda.serializer import UserTaskConverter, StartEventConverter, EndEventConverter, \
+from SpiffWorkflow.camunda.serializer.task_spec_converters import UserTaskConverter, StartEventConverter, EndEventConverter, \
     IntermediateCatchEventConverter, IntermediateThrowEventConverter, BoundaryEventConverter
 
-from SpiffWorkflow.dmn.serializer import BusinessRuleTaskConverter
+from SpiffWorkflow.dmn.serializer.task_spec_converters import BusinessRuleTaskConverter
 
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase
 

tests/SpiffWorkflow/camunda/specs/UserTaskSpecTest.py

@@ -3,7 +3,8 @@ import unittest
 
 from SpiffWorkflow.camunda.specs.UserTask import FormField, UserTask, Form, \
     EnumFormField
-from SpiffWorkflow.specs import WorkflowSpec, TaskSpec
+from SpiffWorkflow.specs.base import TaskSpec
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 
 
 class UserTaskSpecTest(unittest.TestCase):

tests/SpiffWorkflow/data/spiff/workflow1.py

@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
 
-from SpiffWorkflow.specs import ExclusiveChoice, Join, MultiChoice, MultiInstance, Simple, WorkflowSpec
+from SpiffWorkflow.specs.ExclusiveChoice import ExclusiveChoice
+from SpiffWorkflow.specs.Join import Join
+from SpiffWorkflow.specs.MultiChoice import MultiChoice
+from SpiffWorkflow.specs.MultiInstance import MultiInstance
+from SpiffWorkflow.specs.Simple import Simple
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.operators import Attrib, Equal, NotEqual
 
 

tests/SpiffWorkflow/serializer/baseTest.py

@@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(dirname, '..'))
 
 from PatternTest import run_workflow, PatternTest
 from SpiffWorkflow.serializer.base import Serializer
-from SpiffWorkflow.specs import WorkflowSpec
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.workflow import Workflow
 from SpiffWorkflow.serializer.exceptions import TaskNotSupportedError
 

tests/SpiffWorkflow/specs/CeleryTest.py

@@ -6,7 +6,8 @@ import unittest
 import pickle
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 from .TaskSpecTest import TaskSpecTest
-from SpiffWorkflow.specs import Celery, WorkflowSpec
+from SpiffWorkflow.specs.Celery import Celery
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.operators import Attrib
 from SpiffWorkflow.serializer.dict import DictionarySerializer
 from base64 import b64encode

tests/SpiffWorkflow/specs/ExecuteTest.py

@@ -10,7 +10,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 from tests.SpiffWorkflow.util import run_workflow
 from .TaskSpecTest import TaskSpecTest
 from SpiffWorkflow.task import TaskState
-from SpiffWorkflow.specs import Execute
+from SpiffWorkflow.specs.Execute import Execute
 
 
 class ExecuteTest(TaskSpecTest):

tests/SpiffWorkflow/specs/JoinTest.py

@@ -8,7 +8,7 @@ import unittest
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 from .TaskSpecTest import TaskSpecTest
-from SpiffWorkflow.specs import Join
+from SpiffWorkflow.specs.Join import Join
 
 
 class JoinTest(TaskSpecTest):

tests/SpiffWorkflow/specs/MergeTest.py

@@ -8,7 +8,9 @@ import unittest
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 from .JoinTest import JoinTest
-from SpiffWorkflow.specs import Merge, WorkflowSpec, Simple
+from SpiffWorkflow.specs.Merge import Merge
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
+from SpiffWorkflow.specs.Simple import Simple
 from SpiffWorkflow.workflow import Workflow
 
 

tests/SpiffWorkflow/specs/SubWorkflowTest.py

@@ -6,7 +6,7 @@ import os
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
-from SpiffWorkflow.specs import WorkflowSpec
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.specs.SubWorkflow import SubWorkflow
 from SpiffWorkflow.serializer.prettyxml import XmlSerializer
 from SpiffWorkflow.task import TaskState

tests/SpiffWorkflow/specs/TaskSpecTest.py

@@ -5,9 +5,11 @@ import unittest
 import os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
-from SpiffWorkflow.specs import WorkflowSpec, Simple, Join
+from SpiffWorkflow.specs.Join import Join
+from SpiffWorkflow.specs.Simple import Simple
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.exceptions import WorkflowException
-from SpiffWorkflow.specs import TaskSpec
+from SpiffWorkflow.specs.base import TaskSpec
 from SpiffWorkflow.serializer.dict import DictionarySerializer
 
 

tests/SpiffWorkflow/specs/TransformTest.py

@@ -9,7 +9,8 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 from tests.SpiffWorkflow.util import run_workflow
 from .TaskSpecTest import TaskSpecTest
-from SpiffWorkflow.specs import Transform, Simple
+from SpiffWorkflow.specs.Transform import Transform
+from SpiffWorkflow.specs.Simple import Simple
 
 
 class TransformTest(TaskSpecTest):

tests/SpiffWorkflow/specs/WorkflowSpecTest.py

@@ -15,7 +15,8 @@ try:
 except ImportError as e:
     from tests.SpiffWorkflow.util import track_workflow
 from SpiffWorkflow.workflow import Workflow
-from SpiffWorkflow.specs import Join, WorkflowSpec
+from SpiffWorkflow.specs.Join import Join
+from SpiffWorkflow.specs.WorkflowSpec import WorkflowSpec
 from SpiffWorkflow.serializer.prettyxml import XmlSerializer
 
 serializer = XmlSerializer()

tests/SpiffWorkflow/spiff/BaseTestCase.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import os
 
-from SpiffWorkflow.spiff.parser import SpiffBpmnParser, VALIDATOR
+from SpiffWorkflow.spiff.parser.process import SpiffBpmnParser, VALIDATOR
-from SpiffWorkflow.spiff.serializer import NoneTaskConverter, \
+from SpiffWorkflow.spiff.serializer.task_spec_converters import NoneTaskConverter, \
     ManualTaskConverter, UserTaskConverter, ScriptTaskConverter, \
     SubWorkflowTaskConverter, TransactionSubprocessConverter, \
     CallActivityTaskConverter, \
@@ -11,7 +11,7 @@ from SpiffWorkflow.spiff.serializer import NoneTaskConverter, \
     IntermediateCatchEventConverter, IntermediateThrowEventConverter, \
     ServiceTaskConverter
 from SpiffWorkflow.dmn.serializer.task_spec_converters import BusinessRuleTaskConverter
-from SpiffWorkflow.bpmn.serializer import BpmnWorkflowSerializer
+from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer
 
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase