Merge pull request #206 from robotpy/2024-beta

Upgrade to 2024 beta

.github/workflows/dist.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   ci:
-    uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2023
+    uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2024
     secrets:
       META_REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
       PYPI_API_TOKEN: ${{ secrets.PYPI_PASSWORD }}

setup.cfg

@@ -16,11 +16,6 @@ classifiers =
     License :: OSI Approved :: BSD License
     Operating System :: OS Independent
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
     Topic :: Software Development
     Topic :: Scientific/Engineering
 
@@ -29,8 +24,7 @@ zip_safe = False
 include_package_data = True
 packages = find:
 install_requires =
-    pyntcore>=2023.2.1.4
-    wpilib>=2023.2.1,<2024
+    wpilib>=2024.0.0b2.post1,<2025
 setup_requires =
     setuptools_scm > 6
 python_requires = >=3.7

tests/test_magicbot_sm.py

@@ -358,23 +358,25 @@ def test_mixup():
     from robotpy_ext.autonomous import state as _ext_state
     from robotpy_ext.autonomous import timed_state as _ext_timed_state
 
-    with pytest.raises(RuntimeError) as exc_info:
+    with pytest.raises((RuntimeError, TypeError)) as exc_info:
 
         class _SM1(StateMachine):
             @_ext_state(first=True)
             def the_state(self):
                 pass
 
-    assert isinstance(exc_info.value.__cause__, TypeError)
+    if isinstance(exc_info.value, RuntimeError):
+        assert isinstance(exc_info.value.__cause__, TypeError)
 
-    with pytest.raises(RuntimeError) as exc_info:
+    with pytest.raises((RuntimeError, TypeError)) as exc_info:
 
         class _SM2(StateMachine):
             @_ext_timed_state(first=True, duration=1)
             def the_state(self):
                 pass
 
-    assert isinstance(exc_info.value.__cause__, TypeError)
+    if isinstance(exc_info.value, RuntimeError):
+        assert isinstance(exc_info.value.__cause__, TypeError)
 
 
 def test_forbidden_state_names():