diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index b5e58e6cf..ddb5bf4d3 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -5,11 +5,11 @@ permissions: on: push: - branches: [ master ] + branches: [ main ] tags: - 'v*' pull_request: - branches: [ master ] + branches: [ main ] merge_group: concurrency: diff --git a/photon-lib/py/setup.py b/photon-lib/py/setup.py index 7cfb98fcc..01c4331e4 100644 --- a/photon-lib/py/setup.py +++ b/photon-lib/py/setup.py @@ -59,11 +59,11 @@ setup( version=versionString, install_requires=[ "numpy~=2.1", - "wpilib<2026,>=2025.0.0b1", - "robotpy-wpimath<2026,>=2025.0.0b1", - "robotpy-apriltag<2026,>=2025.0.0b1", - "robotpy-cscore<2026,>=2025.0.0b1", - "pyntcore<2026,>=2025.0.0b1", + "wpilib<2026,>=2025.2.1", + "robotpy-wpimath<2026,>=2025.2.1", + "robotpy-apriltag<2026,>=2025.2.1", + "robotpy-cscore<2026,>=2025.2.1", + "pyntcore<2026,>=2025.2.1", "opencv-python;platform_machine!='roborio'", ], description=descriptionStr, diff --git a/photon-lib/py/test/visionSystemSim_test.py b/photon-lib/py/test/visionSystemSim_test.py index 0c8b3cc05..df5dba4c1 100644 --- a/photon-lib/py/test/visionSystemSim_test.py +++ b/photon-lib/py/test/visionSystemSim_test.py @@ -604,10 +604,14 @@ def test_TagAmbiguity() -> None: robotPose = Pose2d() visionSysSim.update(robotPose) - ambiguity = camera.getLatestResult().getBestTarget().getPoseAmbiguity() + tgt = camera.getLatestResult().getBestTarget() + assert tgt is not None + ambiguity = tgt.getPoseAmbiguity() assert ambiguity > 0.5, "Tag ambiguity expected to be high" robotPose = Pose2d(Translation2d(-2.0, -2.0), Rotation2d.fromDegrees(30.0)) visionSysSim.update(robotPose) - ambiguity = camera.getLatestResult().getBestTarget().getPoseAmbiguity() + tgt = camera.getLatestResult().getBestTarget() + assert tgt is not None + ambiguity = tgt.getPoseAmbiguity() assert 0 < ambiguity < 0.2, "Tag ambiguity expected to be high" diff --git a/photonlib-python-examples/aimandrange/pyproject.toml b/photonlib-python-examples/aimandrange/pyproject.toml index 07d7ac969..82e9332bf 100644 --- a/photonlib-python-examples/aimandrange/pyproject.toml +++ b/photonlib-python-examples/aimandrange/pyproject.toml @@ -6,7 +6,7 @@ [tool.robotpy] # Version of robotpy this project depends on -robotpy_version = "2024.3.2.2" +robotpy_version = "2025.2.1" # Which extra RobotPy components should be installed # -> equivalent to `pip install robotpy[extra1, ...] diff --git a/photonlib-python-examples/aimattarget/pyproject.toml b/photonlib-python-examples/aimattarget/pyproject.toml index 07d7ac969..82e9332bf 100644 --- a/photonlib-python-examples/aimattarget/pyproject.toml +++ b/photonlib-python-examples/aimattarget/pyproject.toml @@ -6,7 +6,7 @@ [tool.robotpy] # Version of robotpy this project depends on -robotpy_version = "2024.3.2.2" +robotpy_version = "2025.2.1" # Which extra RobotPy components should be installed # -> equivalent to `pip install robotpy[extra1, ...] diff --git a/photonlib-python-examples/poseest/pyproject.toml b/photonlib-python-examples/poseest/pyproject.toml index 07d7ac969..82e9332bf 100644 --- a/photonlib-python-examples/poseest/pyproject.toml +++ b/photonlib-python-examples/poseest/pyproject.toml @@ -6,7 +6,7 @@ [tool.robotpy] # Version of robotpy this project depends on -robotpy_version = "2024.3.2.2" +robotpy_version = "2025.2.1" # Which extra RobotPy components should be installed # -> equivalent to `pip install robotpy[extra1, ...]