merge for release 0.9.4

.travis.yml

@@ -21,14 +21,15 @@ matrix:
       env: TOXENV=old_tests
     - python: 3.6
       env: TOXENV=mypy
+    - python: 3.9
+    - python: 3.10
 
   allow_failures:
     - python: 3.6  # until we solve all typing issues
       env: TOXENV=mypy
 
 install:
-  - pip install tox-travis
-  - pip install -r requirements.tox.txt
+  - pip install tox tox-travis
 
 script:
   - tox
@@ -41,4 +42,4 @@ deploy:
   skip_cleanup: true
   on:
     tags: true
-    branch: master 
+    branch: master

appveyor.yml

@@ -1,17 +1,22 @@
+# appveyor.yml - https://www.appveyor.com/docs/lang/python
+---
+image:
+  - Visual Studio 2022
+
 skip_branch_with_pr: true
 
 environment:
-  VENV: "%APPVEYOR_BUILD_FOLDER%\\venv"
-
   matrix:
-    - TOXENV: dist
     - TOXENV: py27
-    - TOXENV: pypy
     - TOXENV: py35
     - TOXENV: py36
     - TOXENV: py37
     - TOXENV: py38
+    - TOXENV: py39
+    - TOXENV: py310
+    - TOXENV: pypy
     - TOXENV: pypy3
+    - TOXENV: dist
 
 matrix:
   allow_failures:
@@ -21,20 +26,16 @@ matrix:
 # https://www.appveyor.com/docs/how-to/rdp-to-build-worker/
 init:
   - ps: if (Get-ChildItem Env:ENABLE_RDP -ErrorAction SilentlyContinue) {iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))} else {echo RDP not enabled}
-  - echo "TOXENV- %TOXENV%"
 
 install:
   - if "%TOXENV%"=="pypy" choco install python.pypy
   - if "%TOXENV%"=="pypy3" choco install python.pypy3
-  - py -3.6 -m venv "%VENV%"
-  - "%VENV%\\Scripts\\activate"
-  - python -c "import sys; print(sys.version)"
-  - pip install -r requirements.tox.txt
-  - ps: Update-AppveyorBuild -Version "v$(python get_version.py) b$Env:APPVEYOR_BUILD_NUMBER"
+  - py -m pip install tox
+  - ps: Update-AppveyorBuild -Version "v$(py get_version.py) b$Env:APPVEYOR_BUILD_NUMBER"
 
 build_script:
-  - tox
-  - tox -e codecov
+  - py -m tox
+  - py -m tox -e codecov
 
 artifacts:
   - path: "dist\\*"

docs/cli.rst

@@ -80,6 +80,11 @@ Note: in case of ``.arxml`` there can be multiple can databases in.
 Thus the target ``target.dbc`` may in this case be called ``BUS-NAME-IN-ARXML_target.dbc``.
 There will be one target ``.dbc`` for each database in ``.arxml``.
 
+Note: in case of ``.arxml`` CAN Frames can be in the Container PDU format.
+In this case by default all PDU contained frame are converted to multiplexed frame.
+This can be avoided with ``--ignorePduContainer/--no-ignorePduContainer`` option and
+PDU contained frames will be dropped
+
 You can even convert to the same format:
 
 **convert dbc file to dbc:**
@@ -206,6 +211,13 @@ this will remove signales ``mySignal`` and ``mySignal2`` in ``source.dbc`` and s
 this will load ``source.dbc`` and rename signals ``mySignal`` in ``myNewSignal``  and ``mySignal2`` in ``myNewSignal2``.
 The result is stored in ``target.dlc``.
 
+::
+
+  $ canconvert --signalNameFromAttrib=CompuMethodName source.ARXML target.dbc
+
+this will load ``source.arxml`` and create ``target.dlc`` while all signals are named from CompuMethodName in ARXML.
+Also known values from ARXML are SysSignalName and ISignalName
+
 **canFD:**
 
 ::
@@ -361,6 +373,11 @@ ____________________
 
                         rename Signal form databases. (comma separated list) Syntax: --renameSignal=myOldSignal:myNewSignal,mySecondSignal:mySecondNewSignal
 
+  --signalNameFromAttrib=ATTRIBUTENAME
+
+                        change signal_name to given signal attribute Syntax: --signalNameFromAttrib=SysSignalName
+                        Example --signalNameFromAttrib SysSignalName
+                        ARXML known Attributes: SysSignalName, ISignalName, CompuMethodName
 
 
 * dbc:
@@ -407,10 +424,10 @@ ____________________
 
                         Excel format for startbit of motorola coded signals. Valid values: msb, lsb, msbreverse default msbreverse. [more about starbits...](https://github.com/ebroecker/canmatrix/wiki/signal-Byteorder)
 
-* csv:
+* csv/xls/xlsx:
 
-  --csvAdditionalSignalAttributes
-                        append additional signal-collums to csv, example:
+  --additionalSignalAttributes//--additionalFrameAttributes
+                        append additional signal/frame-colums to csv, example:
                         is_signed,attributes["GenSigStartValue"]
 
 

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:

setup.py

@@ -55,10 +55,13 @@
 Programming Language :: Python :: 3.5
 Programming Language :: Python :: 3.6
 Programming Language :: Python :: 3.7
+Programming Language :: Python :: 3.8
+Programming Language :: Python :: 3.9
+Programming Language :: Python :: 3.10
 """
 
-import sys
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
+
 import versioneer
 
 doclines = __doc__.split("\n")
@@ -70,32 +73,37 @@
     maintainer = "Eduard Broecker",
     maintainer_email = "eduard@gmx.de",
     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:]),
     license = "BSD",
     platforms = ["any"],
-      install_requires = [
-        "attrs>=18.1.0",
-        "bitstruct",
+    install_requires = [
+        "attrs>=19.2.0",
         "click",
+        "enum34; python_version < '3.4'",
         "future",
-        "pathlib2",
+        "six",
         "typing; python_version < '3.5'",
     ],
     extras_require = {
         "arxml": ["lxml"],
-        "kcd": ["lxml"],
-        "fibex": ["lxml"],
-        "xls": ["xlrd", "xlwt"],
-        "xlsx": ["xlsxwriter"],
-        "yaml": ["pyyaml"],
+        "csv": [],
         "dbc": [],
         "dbf": [],
+        "fibex": ["lxml"],
         "json": [],
+        "kcd": ["lxml"],
+        "ldf": ["ldfparser"],
+        "odx": ["lxml"],
+        "scapy": [],
         "sym": [],
-        "test": ["coverage", "pytest", "pytest-cov", "tox"],
+        "test": ["pathlib2; python_version < '3.4'", "pytest"],
+        "wireshark": [],
+        "xls": ["xlrd", "xlwt"],
+        "xlsx": ["xlsxwriter"],
+        "yaml": ["pyyaml"],
     },
 
     packages = find_packages("src"),
@@ -104,4 +112,3 @@
     entry_points={'console_scripts': ['cancompare = canmatrix.cli.compare:cli_compare',
                                       'canconvert = canmatrix.cli.convert:cli_convert']}
 )
-