Merge pull request #840 from ebroecker/development

prepare release 1.1

.github/workflows/ci.yml

@@ -0,0 +1,152 @@
+name: Tests
+
+on:
+  release:
+    types: [ published ]
+  pull_request:
+  push:
+
+env:
+  PY_COLORS: "1"
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }} # See: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontinue-on-error
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        # os: [ubuntu-latest]
+        experimental: [false]
+        # python-version: ["2.7","3.4","3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
+        python-version: ["3.8","3.9","3.10","3.11","3.12"]
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
+    - name: Test with pytest via tox
+      run: |
+        tox -e gh
+    - name: Coveralls
+      uses: coverallsapp/[email protected]
+      with:
+        github-token: ${{ secrets.github_token }}
+        flag-name: Test_${{ matrix.os }}_${{ matrix.python-version }}
+        parallel: true
+        path-to-lcov: ./coverage.lcov
+
+  coveralls:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/[email protected]
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel-finished: true
+
+  # static-code-analysis:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #   - name: Set up Python
+  #     uses: actions/setup-python@v4
+  #     with:
+  #       python-version: "3.10"
+  #   - name: Install dependencies
+  #     run: |
+  #       python -m pip install --upgrade pip
+  #       pip install -e .[lint]
+  #   - name: ruff
+  #     run: |
+  #       ruff check can
+  #   - name: pylint
+  #     run: |
+  #       pylint \
+  #       src/**.py \
+  #       can/io \
+  #       doc/conf.py \
+  #       examples/**.py \
+
+  # format:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #   - name: Set up Python
+  #     uses: actions/setup-python@v4
+  #     with:
+  #       python-version: "3.10"
+  #   - name: Install dependencies
+  #     run: |
+  #       python -m pip install --upgrade pip
+  #       pip install -e .[lint]
+  #   - name: Code Format Check with Black
+  #     run: |
+  #       black --check --verbose .
+
+  # docs:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #   - name: Set up Python
+  #     uses: actions/setup-python@v4
+  #     with:
+  #       python-version: "3.10"
+  #   - name: Install dependencies
+  #     run: |
+  #       python -m pip install --upgrade pip
+  #       pip install -e .[canalystii,gs_usb,mf4]
+  #       pip install -r doc/doc-requirements.txt
+  #   - name: Build documentation
+  #     run: |
+  #       python -m sphinx -Wan --keep-going doc build
+  #   - name: Run doctest
+  #     run: |
+  #       python -m sphinx -b doctest -W --keep-going doc build
+  #   - uses: actions/upload-artifact@v3
+  #     with:
+  #       name: sphinx-out
+  #       path: ./build/
+  #       retention-days: 5
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+      - name: Build wheel and sdist
+        run: pipx run build
+      - name: Check build artifacts
+        run: pipx run twine check --strict dist/*
+      - name: Save artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: python-can-dist
+          path: ./dist
+
+  upload_pypi:
+    needs: [build]
+    runs-on: ubuntu-latest
+
+    # upload to PyPI only on release
+    if: github.event.release && github.event.action == 'published'
+    steps:
+      - uses: actions/[email protected]
+        with:
+          name: python-can-dist
+          path: dist
+
+      - uses: pypa/[email protected]
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}

appveyor.yml

@@ -7,7 +7,6 @@ skip_branch_with_pr: true
 
 environment:
   matrix:
-    - TOXENV: py37
     - TOXENV: py38
     - TOXENV: py39
     - TOXENV: py310

examples/BusmasterRestbus.py

@@ -19,7 +19,6 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 # DAMAGE.
 
-from __future__ import division
 import math
 from struct import *
 import zipfile

examples/j1939_test.py

@@ -0,0 +1,11 @@
+import canmatrix.formats
+
+my_matrix = canmatrix.formats.loadp_flat(r"C:\Users\edu\Downloads\obd2-test\CSS-Electronics-OBD2-incl-extended-v2.0.dbc")
+
+for num, frame in enumerate(my_matrix.frames):
+    print(f"Frame {num}: {frame}")
+    print(f" is j1939: {frame.is_j1939}")
+    print(f" id:  {frame.arbitration_id}")
+    print(f' Format: {frame.attributes["VFrameFormat"]}')
+    if frame.is_j1939:
+        print(f" pgn: {hex(frame.arbitration_id.pgn)}")

mypy.ini

@@ -34,5 +34,5 @@ ignore_errors = True
 ignore_errors = True
 
 # other settings:
-[mypy-xlsxwriter,past,past.builtins,pathlib2]
+[mypy-xlsxwriter,pathlib2]
 ignore_missing_imports = True

requirements_docs.txt

@@ -0,0 +1,6 @@
+lxml
+ldfparser
+xlrd
+xlwt
+openpyxl
+pyyaml

setup.py

@@ -61,7 +61,6 @@
 License :: OSI Approved :: BSD License
 Topic :: Scientific/Engineering
 Programming Language :: Python
-Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3.4
 Programming Language :: Python :: 3.5
 Programming Language :: Python :: 3.6
@@ -82,6 +81,7 @@
     name = "canmatrix",
     version = versioneer.get_version(),
     cmdclass = versioneer.get_cmdclass(),
+    long_description_content_type='text/x-rst',
     maintainer = "Eduard Broecker",
     maintainer_email = "[email protected]",
     url = "http://github.com/ebroecker/canmatrix",
@@ -94,10 +94,7 @@
     install_requires = [
         "attrs>=19.2.0",
         "click",
-        "enum34; python_version < '3.4'",
-        "future",
         "importlib-metadata; python_version < '3.8'",
-        "six",
         "typing; python_version < '3.5'",
     ],
     extras_require = {
@@ -114,9 +111,10 @@
         "sym": [],
         "test": ["pathlib2; python_version < '3.4'", "pytest"],
         "wireshark": [],
-        "xls": ["xlrd", "xlwt"],
-        "xlsx": ["xlsxwriter"],
+        "xls": ["xlrd==1.2.0", "xlwt"],
+        "xlsx": ["openpyxl"],
         "yaml": ["pyyaml"],
+        "eds": ["canopen"]
     },
 
     packages = find_packages("src"),

src/canmatrix/__init__.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
 import logging
 
 import canmatrix._version

src/canmatrix/cancluster.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, print_function
 
 import typing
 from builtins import *