Version bump CI tools

.github/workflows/build.yml

@@ -2,27 +2,49 @@ name: Tests
 
 on: [push, pull_request]
 
+env:
+  PY_COLORS: "1"
+
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  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, macos-latest, windows-latest]
-        python-version: [3.6, 3.7, 3.8]
+        experimental: [false]
+        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        include:
+          - python-version: 3.10.0-alpha.7  # Newest: https://github.com/actions/python-versions/blob/main/versions-manifest.json
+            os: ubuntu-latest
+            experimental: true
+      fail-fast: false
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install tox
-        pip install -r requirements-lint.txt
     - name: Test with pytest via tox
       run: |
         tox -e gh
+
+  format:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements-lint.txt
     - name: Code Format Check with Black
       run: |
         black --check --verbose .

.github/workflows/format-code.yml

@@ -11,9 +11,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.travis.yml

@@ -1,50 +1,32 @@
 language: python
 
 # Linux setup
-dist: xenial
+dist: focal
 
 cache:
   directories:
   - "$HOME/.cache/pip"
 
-python:
-  # CPython; only 3.6 is supported
-  - "3.6"
-  - "3.7"
-  - "3.8"
-  - nightly
-  # PyPy:
-  - pypy3
-
-env:
-
-
 install:
   - if [[ "$TEST_SOCKETCAN" ]]; then sudo bash test/open_vcan.sh ; fi
-  - python setup.py install
+  - travis_retry python setup.py install
 
 script:
   - |
     # install tox
-    pip install tox
+    travis_retry pip install tox
     # Run the tests
     tox -e travis
 
 jobs:
   allow_failures:
-    # we allow all dev & nightly builds to fail, since these python versions might
-    # still be very unstable
-    - python: nightly
     # Allow arm64 builds to fail
     - arch: arm64
 
   include:
-    # Note no matrix support when using stages.
     # Stages with the same name get run in parallel.
     # Jobs within a stage can also be named.
 
-    # Unit Testing Stage
-
     # testing socketcan on Trusty & Python 3.6, since it is not available on Xenial
     - stage: test
       name: Socketcan
@@ -72,15 +54,9 @@ jobs:
         - sudo update-alternatives --install /usr/bin/python python $(which python3) 10
         - sudo update-alternatives --install /usr/bin/pip pip $(which pip3) 10
 
-    # testing on OSX
-    - stage: test
-      os: osx
-      osx_image: xcode8.3
-      python: 3.6-dev
-
     - stage: documentation
       name: "Sphinx Build"
-      python: "3.7"
+      python: "3.9"
       before_install:
         - travis_retry pip install -r doc/doc-requirements.txt
       script:
@@ -90,7 +66,7 @@ jobs:
         - python -m sphinx -an doc build
     - stage: linter
       name: "Linter Checks"
-      python: "3.7"
+      python: "3.9"
       before_install:
         - travis_retry pip install -r requirements-lint.txt
       script:
@@ -132,16 +108,9 @@ jobs:
           can/io/**.py
           scripts/**.py
           examples/**.py
-    - stage: linter
-      name: "Formatting Checks"
-      python: "3.7"
-      before_install:
-        - travis_retry pip install -r requirements-lint.txt
-      script:
-        - black --check --verbose .
     - stage: deploy
       name: "PyPi Deployment"
-      python: "3.7"
+      python: "3.9"
       deploy:
         provider: pypi
         user: hardbyte

README.rst

@@ -25,8 +25,8 @@ python-can
    :target: https://python-can.readthedocs.io/en/stable/
    :alt: Documentation
 
-.. |build_travis| image:: https://img.shields.io/travis/hardbyte/python-can/develop.svg?label=Travis%20CI
-   :target: https://travis-ci.org/hardbyte/python-can/branches
+.. |build_travis| image:: https://img.shields.io/travis/com/hardbyte/python-can/develop.svg?label=Travis%20CI
+   :target: https://travis-ci.com/hardbyte/python-can
    :alt: Travis CI Server for develop branch
 
 .. |build_appveyor| image:: https://img.shields.io/appveyor/ci/hardbyte/python-can/develop.svg?label=AppVeyor

can/__init__.py

@@ -17,9 +17,7 @@
 
 
 class CanError(IOError):
-    """Indicates an error with the CAN network.
-
-    """
+    """Indicates an error with the CAN network."""
 
 
 from .listener import Listener, BufferedReader, RedirectReader, AsyncBufferedReader

can/broadcastmanager.py

@@ -123,8 +123,7 @@ class RestartableCyclicTaskABC(CyclicSendTaskABC):
 
     @abc.abstractmethod
     def start(self):
-        """Restart a stopped periodic task.
-        """
+        """Restart a stopped periodic task."""
 
 
 class ModifiableCyclicTaskABC(CyclicSendTaskABC):
@@ -170,8 +169,7 @@ def modify_data(self, messages: Union[Sequence[Message], Message]):
 
 
 class MultiRateCyclicSendTaskABC(CyclicSendTaskABC):
-    """A Cyclic send task that supports switches send frequency after a set time.
-    """
+    """A Cyclic send task that supports switches send frequency after a set time."""
 
     def __init__(
         self,

can/bus.py

@@ -103,8 +103,8 @@ def recv(self, timeout: Optional[float] = None) -> Optional[Message]:
 
                 if time_left > 0:
                     continue
-                else:
-                    return None
+
+                return None
 
     def _recv_internal(
         self, timeout: Optional[float]
@@ -388,8 +388,7 @@ def _matches_filters(self, msg: Message) -> bool:
         return False
 
     def flush_tx_buffer(self):
-        """Discard every message that may be queued in the output buffer(s).
-        """
+        """Discard every message that may be queued in the output buffer(s)."""
 
     def shutdown(self):
         """

can/ctypesutil.py

@@ -42,7 +42,7 @@ def map_symbol(self, func_name, restype=None, argtypes=(), errcheck=None):
                 "Could not map function '{}' from library {}".format(
                     func_name, self._name
                 )
-            )
+            ) from None
 
         setattr(symbol, "_name", func_name)
         log.debug(

can/interface.py

@@ -29,7 +29,9 @@ def _get_class_for_interface(interface):
     try:
         module_name, class_name = BACKENDS[interface]
     except KeyError:
-        raise NotImplementedError("CAN interface '{}' not supported".format(interface))
+        raise NotImplementedError(
+            "CAN interface '{}' not supported".format(interface)
+        ) from None
 
     # Import the correct interface module
     try:
@@ -39,7 +41,7 @@ def _get_class_for_interface(interface):
             "Cannot import module {} for CAN interface '{}': {}".format(
                 module_name, interface, e
             )
-        )
+        ) from None
 
     # Get the correct class
     try:
@@ -49,7 +51,7 @@ def _get_class_for_interface(interface):
             "Cannot import class {} from module {} for CAN interface '{}': {}".format(
                 class_name, module_name, interface, e
             )
-        )
+        ) from None
 
     return bus_class
 

can/interfaces/ixxat/canlib.py

@@ -61,17 +61,17 @@
 
 
 def __vciFormatErrorExtended(library_instance, function, HRESULT, arguments):
-    """ Format a VCI error and attach failed function, decoded HRESULT and arguments
-        :param CLibrary library_instance:
-            Mapped instance of IXXAT vcinpl library
-        :param callable function:
-            Failed function
-        :param HRESULT HRESULT:
-            HRESULT returned by vcinpl call
-        :param arguments:
-            Arbitrary arguments tuple
-        :return:
-            Formatted string
+    """Format a VCI error and attach failed function, decoded HRESULT and arguments
+    :param CLibrary library_instance:
+        Mapped instance of IXXAT vcinpl library
+    :param callable function:
+        Failed function
+    :param HRESULT HRESULT:
+        HRESULT returned by vcinpl call
+    :param arguments:
+        Arbitrary arguments tuple
+    :return:
+        Formatted string
     """
     # TODO: make sure we don't generate another exception
     return "{} - arguments were {}".format(
@@ -80,15 +80,15 @@ def __vciFormatErrorExtended(library_instance, function, HRESULT, arguments):
 
 
 def __vciFormatError(library_instance, function, HRESULT):
-    """ Format a VCI error and attach failed function and decoded HRESULT
-        :param CLibrary library_instance:
-            Mapped instance of IXXAT vcinpl library
-        :param callable function:
-            Failed function
-        :param HRESULT HRESULT:
-            HRESULT returned by vcinpl call
-        :return:
-            Formatted string
+    """Format a VCI error and attach failed function and decoded HRESULT
+    :param CLibrary library_instance:
+        Mapped instance of IXXAT vcinpl library
+    :param callable function:
+        Failed function
+    :param HRESULT HRESULT:
+        HRESULT returned by vcinpl call
+    :return:
+        Formatted string
     """
     buf = ctypes.create_string_buffer(constants.VCI_MAX_ERRSTRLEN)
     ctypes.memset(buf, 0, constants.VCI_MAX_ERRSTRLEN)

can/interfaces/kvaser/canlib.py

@@ -538,8 +538,7 @@ def _apply_filters(self, filters):
                 pass
 
     def flush_tx_buffer(self):
-        """ Wipeout the transmit buffer on the Kvaser.
-        """
+        """Wipeout the transmit buffer on the Kvaser."""
         canIoCtl(self._write_handle, canstat.canIOCTL_FLUSH_TX_BUFFER, 0, 0)
 
     def _recv_internal(self, timeout=None):
@@ -659,7 +658,7 @@ def get_stats(self):
 
         :returns: bus statistics.
         :rtype: can.interfaces.kvaser.structures.BusStatistics
-         """
+        """
         canRequestBusStatistics(self._write_handle)
         stats = structures.BusStatistics()
         canGetBusStatistics(

can/interfaces/pcan/basic.py

@@ -569,8 +569,7 @@ class TPCANChannelInformation(Structure):
 
 
 class PCANBasic:
-    """PCAN-Basic API class implementation
-    """
+    """PCAN-Basic API class implementation"""
 
     def __init__(self):
         # Loads the PCANBasic.dll and checks if driver is available
@@ -629,25 +628,25 @@ def Initialize(
     def InitializeFD(self, Channel, BitrateFD):
 
         """
-          Initializes a FD capable PCAN Channel
-
-        Parameters:
-          Channel  : The handle of a FD capable PCAN Channel
-          BitrateFD : The speed for the communication (FD bit rate string)
+              Initializes a FD capable PCAN Channel
 
-    Remarks:
-      See PCAN_BR_* values.
-          * parameter and values must be separated by '='
-          * Couples of Parameter/value must be separated by ','
-          * Following Parameter must be filled out: f_clock, data_brp, data_sjw, data_tseg1, data_tseg2,
-            nom_brp, nom_sjw, nom_tseg1, nom_tseg2.
-          * Following Parameters are optional (not used yet): data_ssp_offset, nom_samp
+            Parameters:
+              Channel  : The handle of a FD capable PCAN Channel
+              BitrateFD : The speed for the communication (FD bit rate string)
 
-        Example:
-          f_clock=80000000,nom_brp=10,nom_tseg1=5,nom_tseg2=2,nom_sjw=1,data_brp=4,data_tseg1=7,data_tseg2=2,data_sjw=1
-
-        Returns:
-          A TPCANStatus error code
+        Remarks:
+          See PCAN_BR_* values.
+              * parameter and values must be separated by '='
+              * Couples of Parameter/value must be separated by ','
+              * Following Parameter must be filled out: f_clock, data_brp, data_sjw, data_tseg1, data_tseg2,
+                nom_brp, nom_sjw, nom_tseg1, nom_tseg2.
+              * Following Parameters are optional (not used yet): data_ssp_offset, nom_samp
+
+            Example:
+              f_clock=80000000,nom_brp=10,nom_tseg1=5,nom_tseg2=2,nom_sjw=1,data_brp=4,data_tseg1=7,data_tseg2=2,data_sjw=1
+
+            Returns:
+              A TPCANStatus error code
         """
         try:
             res = self.__m_dllBasic.CAN_InitializeFD(Channel, BitrateFD)