fix tox and continuous integration (#609)

Author: JulienGrv

docs/installation.rst

@@ -11,12 +11,7 @@ or
 
 ::
 
-    $ python setup.py install
-
-and
-::
-
-    $ pip install -r requirements.txt
+    $ pip install .
 
 This installs the *canmatrix* package into your python installation.
 In addition to the *canmatrix* package there are 2 scripts installed with this package:

requirements.test.txt

@@ -72,7 +72,7 @@
     maintainer = "Eduard Broecker",
     maintainer_email = "[email protected]",
     url = "http://github.com/ebroecker/canmatrix",
-    classifiers = filter(None, classifiers.split("\n")),
+    classifiers = list(filter(None, classifiers.split("\n"))),
     description = doclines[0],
     keywords = "CAN dbc arxml kcd dbf sym",
     long_description = "\n".join(doclines[2:]),
@@ -88,13 +88,18 @@
     ],
     extras_require = {
         "arxml": ["lxml"],
+        "csv": [],
         "dbc": [],
         "dbf": [],
         "fibex": ["lxml"],
         "json": [],
         "kcd": ["lxml"],
+        "ldf": ["ldfparser"],
+        "odx": ["lxml"],
+        "scapy": [],
         "sym": [],
         "test": ["pathlib2; python_version < '3.4'", "pytest"],
+        "wireshark": [],
         "xls": ["xlrd", "xlwt"],
         "xlsx": ["xlsxwriter"],
         "yaml": ["pyyaml"],

requirements.txt

@@ -228,7 +228,7 @@ def dump(db, file_object, delimiter=',', **options):
                 signal_row = CsvRow()
                 signal_row += canmatrix.formats.xls_common.get_frame_info(db, frame)
 
-                (front, back) = canmatrix.formats.xls_common.get_signal(db, sig, motorola_bit_format)
+                (front, back) = canmatrix.formats.xls_common.get_signal(db, frame, sig, motorola_bit_format)
                 signal_row += front
                 signal_row += ("s" if sig.is_signed else "u")
 

setup.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 from lxml import etree
 import canmatrix.formats
 import decimal
@@ -38,7 +40,7 @@ def get_short_name(self, element):
         return short_name.text
 
 
-def read_param(eo : OdxReader, param, start_byte_pos=0):
+def read_param(eo, param, start_byte_pos=0):
     return_data = {}
     short_name = eo.get_short_name(param)
     byte_pos = eo.find("BYTE-POSITION", param)
@@ -80,13 +82,13 @@ def read_param(eo : OdxReader, param, start_byte_pos=0):
     return return_data
 
 
-def find_param(eo: OdxReader, request, param_type):
+def find_param(eo, request, param_type):
     for param in eo.findall("PARAM", request):
         if param.attrib["SEMANTIC"] == param_type:
             return param
     return None
 
-def decode_compumethod(eo : OdxReader, compu_method, category):
+def decode_compumethod(eo, compu_method, category):
     compu_info = {}
     if category == "TEXTTABLE":
         compu_info["type"] = "TEXTTABLE"
@@ -118,7 +120,7 @@ def decode_compumethod(eo : OdxReader, compu_method, category):
     return compu_info
 
 
-def get_struct(eo: OdxReader, struct_name, offset_bit=0):
+def get_struct(eo, struct_name, offset_bit=0):
     struct = eo.id_links[struct_name]
 
     byte_size = eo.find("BYTE-SIZE", struct)
@@ -161,7 +163,7 @@ def get_struct(eo: OdxReader, struct_name, offset_bit=0):
     return data_dict
 
 
-def get_odx_info(eo: OdxReader, element_type):
+def get_odx_info(eo, element_type):
     did_infos = {}
     for request in eo.findall(element_type):
         short_name = eo.get_short_name(request)

src/canmatrix/formats/csv.py

@@ -2,9 +2,11 @@
 envlist = py{27,35,36,37,38,39}, pypy{,3}, mypy
 
 [testenv]
+extras =
+    arxml
+    test
+    xls
 deps=
-    -r requirements.test.txt
-    -r requirements.txt
     coverage
     pytest-cov
 passenv=