Move EvaluableExpression

Author: pgleeson

examples/document.py

@@ -1,4 +1,4 @@
-from modelspec import *
+from modelspec.BaseTypes import *
 from modelspec.utils import *
 
 # Example showing how to create a model of a document and use it to create/serialise instances

modelspec/BaseTypes.py

@@ -9,6 +9,12 @@
 DICT_FORMAT = "dict"
 
 
+class EvaluableExpression(str):
+    def __init__(self, expr):
+        self.expr = expr
+
+
+
 def print_(text, print_it=False):
     """
     Print a message preceded by modelspec, only if print_it=True

modelspec/__init__.py

@@ -1,32 +1,2 @@
-import collections
 
-__version__ = "0.1.1"
-
-
-from modelspec.BaseTypes import Base
-from modelspec.BaseTypes import BaseWithId
-from modelspec.BaseTypes import NetworkReader
-
-
-class EvaluableExpression(str):
-    def __init__(self, expr):
-        self.expr = expr
-
-
-if __name__ == "__main__":
-
-    net = Network(id="net")
-    doc = net.generate_documentation(format="markdown")
-    print(doc)
-    with open("../docs/README.md", "w") as d:
-        d.write(doc)
-
-    import json
-    import yaml
-
-    doc = net.generate_documentation(format="dict")
-    doc = {"version": "NeuroMLlite v%s" % __version__, "specification": doc}
-    with open("../docs/NeuroMLlite_specification.json", "w") as d:
-        d.write(json.dumps(doc, indent=4))
-    with open("../docs/NeuroMLlite_specification.yaml", "w") as d:
-        d.write(yaml.dump(doc, indent=4, sort_keys=False))
+__version__ = "0.1.2"

modelspec/test/test_base.py

@@ -1,4 +1,4 @@
-from modelspec import *
+from modelspec.BaseTypes import *
 from modelspec.utils import *
 
 import pickle

modelspec/test/test_utils.py

@@ -1,4 +1,4 @@
-from modelspec import *
+from modelspec.BaseTypes import *
 from modelspec.utils import *
 
 from modelspec.utils import _val_info

modelspec/utils.py

@@ -7,7 +7,7 @@
 import numpy as np
 
 from modelspec.BaseTypes import print_v, print_
-from modelspec import EvaluableExpression
+from modelspec.BaseTypes import EvaluableExpression
 
 verbose = False