prepare release (#512)

* include LICENSE in source distribution (#365)
* arxml: rx/tx typo fix 
* arxml ipdu-groups fix
* annotate and fix codestyle dbc (#369)
* Always use Signal.is_little_endian as bool #326 (#371)
* Add coding, remove #!python where inappropriate (#370)
* annotation cleanup ticket #323 (#372)
* Update cli doc (inspired by #361) (#373)
* fix: xls is using the wrong number for arbitration id (#377)
* add outputformat for Scapy (#378)
* simplify get_fmt
* Dump factor, offset, min, max as float. Load as numeric (#380)
* added --jsonNativeTypes as cli option
* ARXML: merge container PDU and Secured PDU support   #381
* #382 support secured pdus
* Iss381 - fix for #381 - wrong default ArbitrationId handling (#386)
* optional ignoring failures durig character encoding #375 (#388)
* fix for #238 (j1939 Frame setters might raise TypeError) (#389)
* move j1939 (pgn, prio, source) handling direct to arbitration-id class
(fixes #238)
* Iss385 // Arxml Container support and ARXML refactoring (#390)
* ARXML refactoring, DLC for canFD support canmatrix.Frame.fit_dlc now
* fits to next correct dlc value, DBC export reniced for candb++ (#385)
* DBC: fix #242. J1939 and FD Frames in dbc
* XLSX fixes  (#392)
* fix for #288 
* switch from optparse to click (#236) (#394)
* Remove cm prefix (#236) (#399)
* add muxing support to scapy output; merge PR #398 also (#400)
* add basic wireshark dissector creator
* add cannelloni dissector for wireshark
* implement cycle_time as generic signal and frame attribute / remove
Gen[Msg/Sig]cycle from attributes  #146
* use effective frame cycle time for export
* fix for issue #407 [dbc] Signal Comments with space bevore semicolon broken import
* make initial value to a native attribute of Signal class (#408)
* [dbf] exended ids corrected
* optionally allow multiple singals with same name in frame #411 (#412)
* Fix setup.py for console_scripts (#417)
* [dbc] Iss413: fix comment reading with whitespaces in front of ; (#416)
* fix for iss #414, keeps defines in dbc: this keeps defines from dbc in matrix object, even if
native attribute exists.
* [WIP] [ARXML] can_fd info (potentional fix for #410) (#418)
* [ARXML] can-fd recogintion
* add baudrate attributes
* [convert] add delete_obsolete_ecus (fix for #434) (#438)
* [copy] Iss430 better attribute handling  (#437)
* handling missing default values for defines
* add ecu attribute handling #430
* fix for #441 jsonAll export option working again
* make old test less loud
* Fix some bugs in FIBEX export (#445)
* Arxml limits number formats (#457)
* Check for EOF when parsing enums in a .sym file. Fixes #465 (#468)
* Fix test to check for different exception in the python2.7 case
* Log the exception as well when importing a format failed (#467)
* Implement processing of the Title property of .sym files.
* Fix CanMatrix.attribute to return default as documented
* Set the default for the "Title" attribute properly
* Reimplement the quote_aware_comma_split function to handle spaces
between fields
* Change the sym parser to use quote_aware_comma_split to split enum value
tables. Fixes #462.
Add test cases to show that enums are read in correctly from .sym files
* Fix J1939 PGN getter/setter to use full 18bits. Fixes #474 (#475)
* Add enumberations as a field to the json file to store the value tables (#476)
* Adding changes to allow ArbitrationId classes to be sorted (#466)
* Adding comparators to ArbitrationId
* Changing default Arbitration ID extended to False
* Allow parsing of the main .sym signal types : string, raw, char.
* Allow parsing of the main .sym signal types : string, raw, char.
* Add fix for "isidentifier" fucntion on python 2.7
* Fix logic to match variable name. (Functionality unchanged)
* Accept types which are in the value table as enum sgnals (#482)
* Fix additional case in sym enum export (#486)
* Accept types which are in the value table as enum sgnals
* Fix previous change to also generate enums from the signal values field
* [DBF] support j1939 read (#501)
* [arxml] add some basic support for flexray and ethernet data
* prove of concept for flexray dump (#432)
* Read Baudrate from arxml
* Enable reading hex values with prefix 0x
* #496 fix ignore encoding switch
* decode_number now supports floating point value
* dbf fix for exporting empty matrix
* clean encoding error implementation

Co-authored-by: Daniel Hrisca <daniel.hrisca@gmail.com>
Co-authored-by: Funth0mas <43621609+Funth0mas@users.noreply.github.com>
Co-authored-by: Thomas Fritzsche <coccyx00@users.noreply.github.com>
Co-authored-by: chrisoro <4160557+chrisoro@users.noreply.github.com>
Co-authored-by: Kyle Altendorf <sda@fstab.net>
Co-authored-by: akaanich-technica <58173657+akaanich-technica@users.noreply.github.com>
Co-authored-by: Syed <ali462@gmail.com>
Co-authored-by: Seneda <senedanassirali@gmail.com>
Co-authored-by: Ulf Rüegg <uruurumail@gmail.com>
Co-authored-by: Martin Korinek <work@korinek.cc>

.gitignore

@@ -62,3 +62,5 @@ docs/_build/
 
 # PyBuilder
 target/
+/.mypy_cache
+/.idea

.travis.yml

@@ -8,15 +8,13 @@ matrix:
       env: TOXENV=dist
     - python: 2.7
     - python: pypy
-    - python: 3.4
     - python: 3.5
     - python: pypy3.5
     - python: 3.6
     - python: 3.7
       dist: xenial
       sudo: true
-    - python: 2.7
-      env: TOXENV=old_tests
+    - python: 3.8
     - python: 3.7
       dist: xenial
       sudo: true

appveyor.yml

@@ -7,10 +7,10 @@ environment:
     - TOXENV: dist
     - TOXENV: py27
     - TOXENV: pypy
-    - TOXENV: py34
     - TOXENV: py35
     - TOXENV: py36
     - TOXENV: py37
+    - TOXENV: py38
     - TOXENV: pypy3
 
 matrix:

docs/cli.rst

@@ -418,8 +418,9 @@ ____________________
 * arxml:
 
   --arxmlIgnoreClusterInfo
-
                         Ignore any can cluster info from arxml; Import all frames in one matrix default 0
+  --arxmlExportVersion
+                        Ignore any can cluster info from arxml; set arxml version to either 3.2.3 or 4.1.0, default is 3.2.3 
 
 
 * yaml

examples/exampleMerge.py

@@ -31,10 +31,10 @@
 #
 
 # Copy Can-ID 1234 from second CAN-Matrix to target-Matrix
-canmatrix.copy.copy_frame(1234, db2, db3)
+canmatrix.copy.copy_frame(canmatrix.ArbitrationId(100), db2, db3)
 
 # Copy frame "Engine_123" from first CAN-Matrix to target-Matrix
-canmatrix.copy.copy_frame("Engine_123", db1, db3)
+canmatrix.copy.copy_frame(canmatrix.ArbitrationId(200), db1, db3)
 
 # Copy ECU (with all Frames) "Gateway" from first CAN-Matrix to target-Matrix
 canmatrix.copy.copy_ecu_with_frames("Gateway", db1, db3)
@@ -49,4 +49,4 @@
 # export the new (target)-Matrix for example as .dbc:
 #
 
-canmatrix.formats.dumpp(db3, "target.dbc")
+canmatrix.formats.dumpp({"":db3}, "target.dbc")

examples/fr_dump.py

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+import canmatrix.formats
+import sys
+cluster = canmatrix.formats.loadp(sys.argv[1], decode_flexray = True)
+
+for cm in cluster:
+    for frame in cluster[cm]:
+        frame_info = "{}-{}-{}".format(frame.slot_id, frame.base_cycle, frame.repitition_cycle)
+        for pdu in frame.pdus:
+            for signal in pdu.signals:
+                sig_group = pdu.get_signal_group_for_signal(signal)
+                sig_group = "None" if sig_group is None else sig_group.name
+                print("{}: {}, {}, {}, {}, {}".format(frame_info, frame.size, pdu.pdu_type, pdu.name, sig_group, signal.name))
+

requirements.test.py2.txt

@@ -7,9 +7,9 @@ funcsigs==1.0.2
 future==0.16.0
 more-itertools==4.3.0
 pathlib2==2.3.2
-pluggy==0.7.1
+pluggy==0.12.0
 py==1.5.4
-pytest==4.0.0
+pytest==4.6.0
 scandir==1.9.0
 six==1.11.0
 tox==3.2.1
@@ -18,4 +18,5 @@ virtualenv==16.0.0
 xlwt==1.3.0
 xlrd==1.1.0
 click==7.0
-lxml
+lxml==4.5.2
+enum34==1.1.10

requirements.test.py3.txt

@@ -2,19 +2,22 @@ atomicwrites==1.1.5
 attrs==18.1.0
 bitstruct==4.0.0
 -e .[test]
+colorama==0.4.1; python_version == '3.4'
 coverage==4.5.1
 future==0.16.0
 more-itertools==4.3.0
 mypy==0.670; python_version == '3.6'
 pathlib2==2.3.2
-pluggy==0.7.1
+pluggy==0.12.0
 py==1.5.4
-pytest==4.0.0
+pytest==4.6.0
 six==1.11.0
 tox==3.2.1
 typing==3.6.6; python_version < '3.5'
 virtualenv==16.0.0
 xlwt==1.3.0
 xlrd==1.1.0
-lxml==4.3.1
+lxml==4.5.2
 click==7.0
+xlsxwriter==1.2.8
+pyaml==20.4.0

requirements.tox.txt

@@ -1,9 +1,10 @@
 filelock==3.0.10
-pluggy==0.8.1
+pluggy==0.12.0
 py==1.8.0
 six==1.12.0
 toml==0.10.0
 tox==3.7.0
 typing==3.6.6; python_version < '3.5'
 virtualenv==16.4.1
-click==7.0
+click==7.0
+enum34==1.1.10; python_version <= '2.7'

requirements.txt

@@ -8,3 +8,4 @@ future
 attrs>=18.1.0
 typing; python_version < '3.5'
 pathlib2
+enum34; python_version <= '2.7'