Merge branch 'release/0.7.5'

zetaops · Oct 26, 2016 · 069f207 · 069f207
2 parents 5a899c7 + 14b0ce3
commit 069f207
Showing 58 changed files with 2,925 additions and 714 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.7.4
+v0.7.5
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
@@ -14,6 +14,15 @@ Permission related
 
   ``redis-cli flushall``
 
+Decorator usage
+-------------------
+- When you use a decorator from ``zengine.lib.decorators`` make sure the modules that contain decorated methods imported at runtime.
+        - Module paths listed under ``settings.AUTO_IMPORT_MODULES`` are auto imported at runtime.
+        - Modules that contain data model definitions are most likely imported by
+
+
+  ``redis-cli flushall``
+
 
 Pyoko / DB Related
 -------------------

diff --git a/requirements/default.txt b/requirements/default.txt
@@ -12,3 +12,4 @@ pytest
 celery
 tornado
 pika
+babel
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='zengine',
-    version='0.7.4',
+    version='0.7.5',
     url='https://github.com/zetaops/zengine',
     license='GPL v3',
     packages=find_packages(exclude=['tests', 'tests.*']),
@@ -13,7 +13,7 @@
                 'permissions and extensible CRUD features',
     install_requires=['beaker', 'passlib', 'falcon', 'beaker_extensions', 'lazy_object_proxy',
                       'redis', 'enum34', 'werkzeug', 'celery', 'SpiffWorkflow', 'pyoko',
-                      'tornado', 'pika'],
+                      'tornado', 'pika', 'babel'],
     dependency_links=[
         'git+https://github.com/didip/beaker_extensions.git#egg=beaker_extensions',
         'git+https://github.com/zetaops/SpiffWorkflow.git#egg=SpiffWorkflow',

diff --git a/tests/diagrams/i18n.bpmn b/tests/diagrams/i18n.bpmn
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.2.2">
+  <bpmn:process id="i18n" isExecutable="false">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>SequenceFlow_0nbnjv6</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_0nbnjv6" sourceRef="StartEvent_1" targetRef="output_msg" />
+    <bpmn:endEvent id="EndEvent_0zqoxv1">
+      <bpmn:incoming>SequenceFlow_0y0v1li</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_0y0v1li" sourceRef="output_msg" targetRef="EndEvent_0zqoxv1" />
+    <bpmn:userTask id="output_msg" name="Output i18n Message" camunda:assignee="i18n.output_message">
+      <bpmn:incoming>SequenceFlow_0nbnjv6</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0y0v1li</bpmn:outgoing>
+    </bpmn:userTask>
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="i18n">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="173" y="102" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0nbnjv6_di" bpmnElement="SequenceFlow_0nbnjv6">
+        <di:waypoint xsi:type="dc:Point" x="209" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="240" y="120" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="179.5" y="95" width="90" height="20" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="EndEvent_0zqoxv1_di" bpmnElement="EndEvent_0zqoxv1">
+        <dc:Bounds x="370.4392985611511" y="102" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="343.4392985611511" y="138" width="90" height="20" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0y0v1li_di" bpmnElement="SequenceFlow_0y0v1li">
+        <di:waypoint xsi:type="dc:Point" x="340" y="120" />
+        <di:waypoint xsi:type="dc:Point" x="370" y="120" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="310" y="95" width="90" height="20" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="UserTask_00etlxw_di" bpmnElement="output_msg">
+        <dc:Bounds x="240" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/tests/diagrams/jump_to_wf2.bpmn b/tests/diagrams/jump_to_wf2.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_qyVjYLNPEeSf4I-xcGOQ0Q" targetNamespace="http://activiti.org/bpmn" exporter="camunda modeler" exporterVersion="2.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_qyVjYLNPEeSf4I-xcGOQ0Q" targetNamespace="http://activiti.org/bpmn" exporter="Camunda Modeler" exporterVersion="1.2.2" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="jump_to_wf2" isExecutable="false">
     <bpmn2:extensionElements>
       <camunda:properties>
@@ -31,11 +31,11 @@
       <bpmn2:incoming>SequenceFlow_1qaf42c</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0jhvsan</bpmn2:outgoing>
     </bpmn2:userTask>
-    <bpmn2:endEvent id="EndEvent_0mjmr4u">
+    <bpmn2:endEvent id="EndEvent" name="EndEvent">
       <bpmn2:incoming>SequenceFlow_08vpzwx</bpmn2:incoming>
     </bpmn2:endEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_0jhvsan" sourceRef="UserTask_1vonzu0" targetRef="ServiceTask_14bi5j2" />
-    <bpmn2:sequenceFlow id="SequenceFlow_08vpzwx" sourceRef="ServiceTask_14bi5j2" targetRef="EndEvent_0mjmr4u" />
+    <bpmn2:sequenceFlow id="SequenceFlow_08vpzwx" sourceRef="ServiceTask_14bi5j2" targetRef="EndEvent" />
     <bpmn2:serviceTask id="ServiceTask_14bi5j2">
       <bpmn2:incoming>SequenceFlow_0jhvsan</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_08vpzwx</bpmn2:outgoing>
@@ -67,7 +67,7 @@
       <bpmndi:BPMNShape id="UserTask_1vonzu0_di" bpmnElement="UserTask_1vonzu0">
         <dc:Bounds x="315" y="186" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="EndEvent_0mjmr4u_di" bpmnElement="EndEvent_0mjmr4u">
+      <bpmndi:BPMNShape id="EndEvent_0mjmr4u_di" bpmnElement="EndEvent">
         <dc:Bounds x="638" y="208" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="611" y="244" width="90" height="20" />

diff --git a/tests/diagrams/multi_user.bpmn b/tests/diagrams/multi_user.bpmn
-Original file line number
+Diff line change
@@ @@ -12,3 +12,4 @@ pytest @@
     celery
     tornado
     pika
+    babel