solar - no engine. Simplified test setUp/tearDown, min args

README.rst

@@ -79,4 +79,6 @@ allocate a payment to a set of outstanding orders
 
 0.2.0 - Minor design refactoring of allocation
 
-0.3.0 - Include logic_bank.extensions (allocation), constraint exceptions raised as ConstraintExceptions
+0.3.0 - Include logic_bank.extensions (allocation), constraint exceptions raised as ConstraintExceptions
+
+0.4.0 - Eliminate "engine" from runtime, to faciliate use in servers.  Rework nw tests to centralize open logic in setup().

logic_bank/exec_row_logic/logic_row.py

@@ -55,7 +55,6 @@ def __init__(self, row: base, old_row: base, ins_upd_dlt: str, nest_level: int,
         rb = RuleBank()
         self.rb = rb
         self.session = a_session
-        # solar no engine self.session = rb.session; self.engine = rb._engine
         self.some_base = declarative_base()
 
         self.name = type(self.row).__name__  # class name (not table name)
@@ -66,10 +65,6 @@ def __init__(self, row: base, old_row: base, ins_upd_dlt: str, nest_level: int,
             else:
                 self.table_meta = inspect(self.row)
                 self.log_engine("Restriction: Class Name must equal Table Name: " + self.name)
-        """ solar no engine
-        if self.engine is not None:  # e.g, for testing legacy logic (no RuleBank)
-            self.inspector = Inspector.from_engine(self.engine)
-        """
 
     def get_attr_name(self, mapper, attr)-> str:
         """polymorhpism is for wimps - find the name

logic_bank/logic_bank.py

@@ -36,10 +36,9 @@ def activate(session: session, activator: callable):
         :param activator: function that declares rules (e.g., Rule.sum...)
         """
 
-        # solar engine = session.bind.engine
-        rule_bank_setup.setup(session)  # solar , engine)
+        rule_bank_setup.setup(session)
         activator()
-        rule_bank_setup.compute_formula_execution_order()   # solar session, engine)
+        rule_bank_setup.compute_formula_execution_order()
 
 
 class Rule:

logic_bank/rule_bank/rule_bank.py

@@ -43,13 +43,6 @@ class RuleBank(metaclass=Singleton):  # FIXME design review singleton
     """ Dict[mapped_class: str, List[TablesRules]] -- rules for a table """
     _at = datetime.now()
 
-    """ solar - no engine
-    _metadata = None
-    _base = None
-    _session = None
-    _engine = None
-    """
-
     def __init__(self):
         self._metadata = None
 

logic_bank/rule_bank/rule_bank_setup.py

@@ -9,27 +9,19 @@
 from sqlalchemy.orm import session
 
 
-def setup(a_session: session):  # solar , an_engine: Engine):
+def setup(a_session: session):
     """
     Create the RuleBank
 
     Register before_flush listeners
 
     """
     rules_bank = RuleBank()
-    # rules_bank._session = a_session  """ solar no rb.session... """
     event.listen(a_session, "before_flush", before_flush)
     event.listen(a_session, "before_commit", before_commit)
 
     rules_bank.orm_objects = {}
     rules_bank._at = datetime.now()
-
-    """ solar no engine...
-    rules_bank._engine = an_engine
-    rules_bank._metadata = MetaData(bind=an_engine, reflect=True)
-    from sqlalchemy.ext.declarative import declarative_base
-    rules_bank._base = declarative_base()
-    """
     return
 
 
@@ -77,7 +69,7 @@ def compute_formula_execution_order_for_class(class_name: str):
             raise Exception("Mapped Class[" + class_name + "] blocked by circular dependencies:" + cycles)
 
 
-def compute_formula_execution_order() -> bool:  # solar, a_session: sessionengine: Engine):
+def compute_formula_execution_order() -> bool:
     """
     Determine formula execution order based on "row.xx" references (dependencies),
     (or raise exception if cycles detected).

nw/tests/test_add_cust.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 
 (did_fix_path, sys_env_info) = \
-    logic_bank_utils.add_python_path(project_dir="LogicBank", my_file=__file__)
+    logic_bank_utils.add_python_path(project_dir="LogicBank*", my_file=__file__)
 
 if  __name__ == '__main__':
     print("\nStarted from cmd line - launch unittest and exit\n")

nw/tests/test_add_order.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 
 (did_fix_path, sys_env_info) = \
-    logic_bank_utils.add_python_path(project_dir="LogicBank", my_file=__file__)
+    logic_bank_utils.add_python_path(project_dir="LogicBank*", my_file=__file__)
 
 if  __name__ == '__main__':
     print("\nStarted from cmd line - launch unittest and exit\n")

nw/tests/test_dlt_order.py

@@ -4,7 +4,7 @@
 from decimal import Decimal
 
 (did_fix_path, sys_env_info) = \
-    logic_bank_utils.add_python_path(project_dir="LogicBank", my_file=__file__)
+    logic_bank_utils.add_python_path(project_dir="LogicBank*", my_file=__file__)
 
 if  __name__ == '__main__':
     print("\nStarted from cmd line - launch unittest and exit\n")

nw/tests/test_upd_employee_salary.py

@@ -4,7 +4,7 @@
 from decimal import Decimal
 
 (did_fix_path, sys_env_info) = \
-    logic_bank_utils.add_python_path(project_dir="LogicBank", my_file=__file__)
+    logic_bank_utils.add_python_path(project_dir="LogicBank*", my_file=__file__)
 
 if  __name__ == '__main__':
     print("\nStarted from cmd line - launch unittest and exit\n")

nw/tests/test_upd_order_customer.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 
 (did_fix_path, sys_env_info) = \
-    logic_bank_utils.add_python_path(project_dir="LogicBank", my_file=__file__)
+    logic_bank_utils.add_python_path(project_dir="LogicBank*", my_file=__file__)
 
 if  __name__ == '__main__':
     print("\nStarted from cmd line - launch unittest and exit\n")

nw/tests/test_upd_order_required.py

@@ -4,7 +4,7 @@
 from decimal import Decimal
 
 (did_fix_path, sys_env_info) = \
-    logic_bank_utils.add_python_path(project_dir="LogicBank", my_file=__file__)
+    logic_bank_utils.add_python_path(project_dir="LogicBank*", my_file=__file__)
 
 if  __name__ == '__main__':
     print("\nStarted from cmd line - launch unittest and exit\n")

nw/tests/test_upd_order_reuse.py

@@ -4,7 +4,7 @@
 from decimal import Decimal
 
 (did_fix_path, sys_env_info) = \
-    logic_bank_utils.add_python_path(project_dir="LogicBank", my_file=__file__)
+    logic_bank_utils.add_python_path(project_dir="LogicBank*", my_file=__file__)
 
 if  __name__ == '__main__':
     print("\nStarted from cmd line - launch unittest and exit\n")

nw/tests/test_upd_order_shipped.py

@@ -4,7 +4,7 @@
 from decimal import Decimal
 
 (did_fix_path, sys_env_info) = \
-    logic_bank_utils.add_python_path(project_dir="LogicBank", my_file=__file__)
+    logic_bank_utils.add_python_path(project_dir="LogicBank*", my_file=__file__)
 
 if  __name__ == '__main__':
     print("\nStarted from cmd line - launch unittest and exit\n")

nw/tests/test_upd_order_shipped_auto_commit.py

@@ -4,7 +4,7 @@
 from decimal import Decimal
 
 (did_fix_path, sys_env_info) = \
-    logic_bank_utils.add_python_path(project_dir="LogicBank", my_file=__file__)
+    logic_bank_utils.add_python_path(project_dir="LogicBank*", my_file=__file__)
 
 if  __name__ == '__main__':
     print("\nStarted from cmd line - launch unittest and exit\n")

nw/tests/test_upd_orderclass_required.py

@@ -4,7 +4,7 @@
 from decimal import Decimal
 
 (did_fix_path, sys_env_info) = \
-    logic_bank_utils.add_python_path(project_dir="LogicBank", my_file=__file__)
+    logic_bank_utils.add_python_path(project_dir="LogicBank*", my_file=__file__)
 
 if  __name__ == '__main__':
     print("\nStarted from cmd line - launch unittest and exit\n")

requirements.txt

@@ -3,4 +3,4 @@ six==1.15.0
 SQLAlchemy==1.3.20
 SQLAlchemy-Utils==0.36.8
 Flask-AppBuilder==3.1.1
-LogicBankUtils==0.5.0
+LogicBankUtils

setup.py

@@ -22,7 +22,7 @@ def desc():
 
 setup(
     name="logicbank",
-    version="0.3.0",
+    version="0.4.0",
     url="https://github.com/valhuber/logicbank",
     license="BSD",
     author="Val Huber",