Merge pull request #18 from altendky/master

Add setup.py for Setuptools support

Author: altendky

BusmasterRestbus.py

@@ -5,7 +5,7 @@
 from builtins import *
 import math
 from struct import *
-import library.importany as im
+import canmatrix.importany as im
 import zipfile
 import sys
 import os

TODO.md

@@ -4,12 +4,12 @@
 
 
 
-library/canmatrix.py
+canmatrix/canmatrix.py
 : Definitions should be imported with disassembling not as complete string
 
 
 
-library/canmatrixGenerateJS.py
+canmatrix/canmatrixGenerateJS.py
  wrong bits are used if signal is not
 
 
@@ -26,7 +26,7 @@ library/canmatrixGenerateJS.py
 
 
 
-library/exportarxml.py
+canmatrix/exportarxml.py
  Well, ..., this is the first attempt to export a arxml-file; I did this without reading any spec;
  recievers of signals are missing
 : insert Speed - if possible
@@ -41,6 +41,8 @@ library/exportarxml.py
 
 
 
+canmatrix/exportkcd.py
+ : support for extended frames (https://github.com/julietkilo/CANBabel/blob/master/src/main/java/com/github/canbabel/canio/kcd/Message.java) :
 
 
 
@@ -62,33 +64,33 @@ library/exportarxml.py
 
 
 
-library/importarxml.py
+canmatrix/importarxml.py
  Well, ..., this is the first attempt to import a arxml-file; I did this without reading any spec;
     : use diagAddress for frame-classification
 
 
 
 
-library/importdbc.py
+canmatrix/importdbc.py
  support for: VERSION, NS, BS_, SIG_VALTYPE_, BA_DEF_REL == BA_DEF_??, BA_DEF_DEF_REL_ = BA_DEF_DEF_  ??
 
 
 
-library/importdbf.py
+canmatrix/importdbf.py
  support for [START_PARAM_NODE_RX_SIG]
  support for [START_PARAM_NODE_TX_MSG]
 
 
 
-library/importkcd.py
+canmatrix/importkcd.py
  baudrate missing
  name save
  defaults for CAN-Simulation missing
  LabelGroup not supported
 
 
 
-library/importsym.py
+canmatrix/importsym.py
  : the signalname should be unique. If same signal-name is used in different mux-ids, the signal-name should be unified. maybe this is an dbc-export-issue not an sym-import-issue
  : I don't know what to do with the "/p"-Options in the signal-definition
  : what is the differenze between SEND and SENDRECEIVE ?
@@ -106,6 +108,9 @@ library/importsym.py
 
 
 
+
+
+
 test/test.py
  : support testing of xlsx
              : support testing of xlsx

library/__init__.py renamed to canmatrix/__init__.py

@@ -1,7 +1,7 @@
 from builtins import *
 #!/usr/bin/env python
 
-from library.canmatrix import *
+from .canmatrix import *
 import codecs
 import json
 import sys

library/autosarhelper.py renamed to canmatrix/autosarhelper.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from library.canmatrix import *
+from .canmatrix import *
 import codecs
 import yaml
 

library/canmatrix.py renamed to canmatrix/canmatrix.py

@@ -31,6 +31,8 @@ def importany(filename):
         db = im.importDbf(filename)
     elif filename[-3:] == 'kcd':
         db = im.importKcd(filename)
+    elif filename[-3:] == 'sym':
+        db = im.importSym(filename)
     elif filename[-3:] == 'xls' or filename[-4:] == 'xlsx' :
         db = im.importXls(filename)
     elif filename[-5:] == 'arxml':

library/canmatrixGenerateJS.py renamed to canmatrix/canmatrixGenerateJS.py

@@ -56,7 +56,7 @@ class FollowUps(object):
                 comment += "\n" + l.decode(dbcCommentEncoding).replace('\\"','"')
             except:
                 print ("Error decoding line: %d (%s)" % (i, line))
-            if l.endswith('";'):
+            if l.endswith(b'";'):
                 followUp = FollowUps.nothing
                 if signal is not None:
                     signal.addComment(comment[0:-2])
@@ -66,7 +66,7 @@ class FollowUps(object):
                 comment += "\n" + l.decode(dbcCommentEncoding).replace('\\"','"')
             except:
                 print ("Error decoding line: %d (%s)" % (i, line))
-            if l.endswith('";'):
+            if l.endswith(b'";'):
                 followUp = FollowUps.nothing
                 if frame is not None:
                     frame.addComment(comment[0:-2])
@@ -76,7 +76,7 @@ class FollowUps(object):
                 comment += "\n" + l.decode(dbcCommentEncoding).replace('\\"','"')
             except:
                 print ("Error decoding line: %d (%s)" % (i, line))
-            if l.endswith('";'):
+            if l.endswith(b'";'):
                 followUp = FollowUps.nothing
                 if boardUnit is not None:
                     boardUnit.addComment(comment[0:-2])

library/compare.py renamed to canmatrix/compare.py

@@ -30,7 +30,7 @@
 from __future__ import print_function
 from builtins import *
 import math
-from library.canmatrix import *
+from .canmatrix import *
 import xlrd
 import codecs
 

library/copy.py renamed to canmatrix/copy.py

@@ -29,7 +29,7 @@
 from __future__ import division
 from builtins import *
 import math
-from library.canmatrix import *
+from .canmatrix import *
 import codecs
 import zipfile
 from xml.etree.ElementTree import iterparse

library/exportJson.py renamed to canmatrix/exportJson.py

@@ -2,8 +2,8 @@
 
 from __future__ import print_function
 from builtins import *
-import library.importany as im
-from library.compare import *
+import canmatrix.importany as im
+from canmatrix.compare import *
 import sys
 import codecs
 
@@ -27,25 +27,6 @@
 #OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 #DAMAGE.
 
-if len(sys.argv) < 3:
-    sys.stderr.write('Usage: sys.argv[0] matrix1 matrix2\n')
-    sys.stderr.write('matrixX can be any of *.dbc|*.dbf|*.kcd|*.arxml\n')
-    sys.exit(1)
-
-matrix1 = sys.argv[1]
-matrix2 = sys.argv[2]
-
-print("Importing " + matrix1 + " ... ")
-db1 = im.importany(matrix1)
-print("%d Frames found" % (db1._fl._list.__len__()))
-
-print("Importing " + matrix2 + " ... ")
-db2 = im.importany(matrix2)
-print("%d Frames found" % (db2._fl._list.__len__()))
-
-
-print("\n\n")
-
 
 def dumpResult(res, depth = 0):
     if res._type is not None and res._result != "equal":
@@ -63,8 +44,32 @@ def dumpResult(res, depth = 0):
     for child in res._children:
         dumpResult(child, depth+1)
 
-ignore = {}
-#ignore["ATTRIBUTE"] = "*"
-#ignore["DEFINE"] = "*"
-obj = compareDb(db1, db2, ignore)
-dumpResult(obj)
+def main():
+    if len(sys.argv) < 3:
+        sys.stderr.write('Usage: sys.argv[0] matrix1 matrix2\n')
+        sys.stderr.write('matrixX can be any of *.dbc|*.dbf|*.kcd|*.arxml\n')
+        sys.exit(1)
+
+    matrix1 = sys.argv[1]
+    matrix2 = sys.argv[2]
+
+    print("Importing " + matrix1 + " ... ")
+    db1 = im.importany(matrix1)
+    print("%d Frames found" % (db1._fl._list.__len__()))
+
+    print("Importing " + matrix2 + " ... ")
+    db2 = im.importany(matrix2)
+    print("%d Frames found" % (db2._fl._list.__len__()))
+
+
+    print("\n\n")
+
+
+    ignore = {}
+    #ignore["ATTRIBUTE"] = "*"
+    #ignore["DEFINE"] = "*"
+    obj = compareDb(db1, db2, ignore)
+    dumpResult(obj)
+
+if __name__ == '__main__':
+    sys.exit(main())

library/exportall.py renamed to canmatrix/exportall.py

@@ -21,9 +21,9 @@
 #DAMAGE.
 
 from __future__ import print_function
-import library.exportall as ex
-import library.importall as im
-import library.canmatrix as cm
+import canmatrix.exportall as ex
+import canmatrix.importall as im
+import canmatrix.canmatrix as cm
 import os
 import sys
 

library/exportarxml.py renamed to canmatrix/exportarxml.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
 # importany laed alle verfuegbaren importfilter
-from library.copy import *
-import library.importany as im
-import library.exportall as ex
+from canmatrix.copy import *
+import canmatrix.importany as im
+import canmatrix.exportall as ex
 #fuer Fileio:
 import sys
 

library/exportdbc.py renamed to canmatrix/exportdbc.py

@@ -0,0 +1,9 @@
+from setuptools import setup, find_packages
+
+setup(
+    name = "canmatrix",
+    version = "0.1",
+    packages = find_packages(),
+    entry_points={'console_scripts': ['compare = compare:main',
+                                      'convert = convert:main']}
+)

library/exportdbf.py renamed to canmatrix/exportdbf.py

@@ -4,8 +4,8 @@
 import sys
 sys.path.append('..')
 
-import library.exportall as ex
-from library.canmatrix import *
+import canmatrix.exportall as ex
+from canmatrix.canmatrix import *
 
 #
 # create target Matrix