Merge branch 'christiansandberg:master' into feature-asyncio

Author: sveinse

.github/workflows/pythonpackage.yml

@@ -1,22 +1,27 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
 
 name: Python package
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [3.6, '3.x']
+        python-version: ['3.x']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/pythonpublish.yml

@@ -1,31 +1,39 @@
-# This workflows will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
 
 name: Upload Python Package
 
 on:
   release:
-    types: [created]
+    types: [published]
+
+permissions:
+  contents: read
 
 jobs:
   deploy:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v3
       with:
         python-version: '3.x'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel build twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python -m build
-        twine upload dist/*
+        pip install build
+    - name: Build package
+      run: python -m build
+    - name: Publish package
+      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}

.readthedocs.yaml

@@ -0,0 +1,25 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: doc/conf.py
+
+# If using Sphinx, optionally build your docs in additional formats such as PDF
+# formats:
+#    - pdf
+
+# Optionally declare the Python requirements required to build your docs
+python:
+   install:
+   - method: pip
+     path: .
+   - requirements: doc/requirements.txt

canopen/node/local.py

@@ -113,6 +113,12 @@ def set_data(
         if check_writable and not obj.writable:
             raise SdoAbortedError(0x06010002)
 
+        # Check length matches type (length of od variable is in bits)
+        if obj.data_type in objectdictionary.NUMBER_TYPES and (
+            not 8 * len(data) == len(obj)
+        ):
+            raise SdoAbortedError(0x06070010)
+
         # Try callbacks
         for callback in self._write_callbacks:
             callback(index=index, subindex=subindex, od=obj, data=data)

doc/requirements.txt

@@ -0,0 +1,2 @@
+sphinx
+sphinx-autodoc-typehints

test/test_local.py

@@ -71,6 +71,16 @@ def test_expedited_download(self):
         value = self.local_node.sdo[0x2004].raw
         self.assertEqual(value, 0xfeff)
 
+    def test_expedited_download_wrong_datatype(self):
+        # Try to write 32 bit in integer16 type
+        with self.assertRaises(canopen.SdoAbortedError) as error:
+            self.remote_node.sdo.download(0x2001, 0x0, bytes([10, 10, 10, 10]))
+        self.assertEqual(error.exception.code, 0x06070010)
+        # Try to write normal 16 bit word, should be ok
+        self.remote_node.sdo.download(0x2001, 0x0, bytes([10, 10]))
+        value = self.remote_node.sdo.upload(0x2001, 0x0)
+        self.assertEqual(value, bytes([10, 10]))
+
     def test_segmented_download(self):
         self.remote_node.sdo[0x2000].raw = "Another cool device"
         value = self.local_node.sdo[0x2000].data