ci: Update to pypy-3.7 and add Python 3.10 on Ubuntu & MacOS

.github/workflows/build.yml

@@ -13,11 +13,16 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         experimental: [false]
-        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "pypy-3.7"]
         include:
-          - python-version: 3.10.0-beta.4  # Newest: https://github.com/actions/python-versions/blob/main/versions-manifest.json
-            os: ubuntu-latest
-            experimental: true
+          # Skipping Py 3.10 on Windows until windows-curses has a cp310 wheel,
+          # see https://github.com/zephyrproject-rtos/windows-curses/issues/26
+          - os: ubuntu-latest
+            experimental: false
+            python-version: "3.10"
+          - os: macos-latest
+            experimental: false
+            python-version: "3.10"
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
@@ -41,10 +46,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.9
+    - name: Set up Python 3.10
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: "3.10"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

can/listener.py

@@ -116,7 +116,10 @@ def get_message(self, timeout: float = 0.5) -> Optional[Message]:
         :return: the Message if there is one, or None if there is not.
         """
         try:
-            return self.buffer.get(block=not self.is_stopped, timeout=timeout)
+            if self.is_stopped:
+                return self.buffer.get(block=False)
+            else:
+                return self.buffer.get(block=True, timeout=timeout)
         except Empty:
             return None
 

test/test_message_class.py

@@ -9,12 +9,15 @@
 from datetime import timedelta
 
 from hypothesis import given, settings
+import hypothesis.errors
 import hypothesis.strategies as st
 
 from can import Message
 
 from .message_helper import ComparingMessagesTestCase
-from .config import IS_GITHUB_ACTIONS
+from .config import IS_GITHUB_ACTIONS, IS_WINDOWS, IS_PYPY
+
+import pytest
 
 
 class TestMessageClass(unittest.TestCase):
@@ -42,6 +45,11 @@ class TestMessageClass(unittest.TestCase):
         max_examples=2000,
         deadline=None if IS_GITHUB_ACTIONS else timedelta(milliseconds=500),
     )
+    @pytest.mark.xfail(
+        IS_WINDOWS and IS_PYPY,
+        raises=hypothesis.errors.Flaky,
+        reason="Hypothesis generates inconistent timestamp floats on Windows+PyPy-3.7",
+    )
     def test_methods(self, **kwargs):
         is_valid = not (
             (

tox.ini

@@ -7,7 +7,7 @@ deps =
     pytest-cov==2.12.*
     coverage==5.5
     codecov==2.1.10
-    hypothesis~=4.56
+    hypothesis~=6.24.0
     pyserial~=3.0
     parameterized~=0.8