From 30645803e6117eae70ceda427ebbeb63ba45c099 Mon Sep 17 00:00:00 2001 From: Sam Freund Date: Wed, 19 Mar 2025 00:31:59 -0500 Subject: [PATCH] chore: bump wpilib to 2025.3.2 and fix mypy errors (#1819) --- build.gradle | 4 ++-- .../advanced-installation/sw_install/windows-pc.md | 2 +- .../py/photonlibpy/simulation/photonCameraSim.py | 4 ++-- photon-lib/py/setup.py | 10 +++++----- photonlib-cpp-examples/aimandrange/build.gradle | 6 +++--- photonlib-cpp-examples/aimattarget/build.gradle | 6 +++--- photonlib-cpp-examples/poseest/build.gradle | 6 +++--- photonlib-java-examples/aimandrange/build.gradle | 6 +++--- photonlib-java-examples/aimattarget/build.gradle | 6 +++--- photonlib-java-examples/poseest/build.gradle | 6 +++--- photonlib-python-examples/aimandrange/pyproject.toml | 2 +- photonlib-python-examples/aimattarget/pyproject.toml | 2 +- photonlib-python-examples/poseest/pyproject.toml | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index 72ccf2c43..90ac4a7b0 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id "cpp" id "com.diffplug.spotless" version "6.24.0" id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2" - id "edu.wpi.first.GradleRIO" version "2025.3.1" + id "edu.wpi.first.GradleRIO" version "2025.3.2" id 'edu.wpi.first.WpilibTools' version '1.3.0' id 'com.google.protobuf' version '0.9.3' apply false id 'edu.wpi.first.GradleJni' version '1.1.0' @@ -33,7 +33,7 @@ ext.allOutputsFolder = file("$project.buildDir/outputs") apply from: "versioningHelper.gradle" ext { - wpilibVersion = "2025.3.1" + wpilibVersion = "2025.3.2" wpimathVersion = wpilibVersion openCVYear = "2025" openCVversion = "4.10.0-3" diff --git a/docs/source/docs/advanced-installation/sw_install/windows-pc.md b/docs/source/docs/advanced-installation/sw_install/windows-pc.md index 653297fd6..629b32fa7 100644 --- a/docs/source/docs/advanced-installation/sw_install/windows-pc.md +++ b/docs/source/docs/advanced-installation/sw_install/windows-pc.md @@ -12,7 +12,7 @@ Bonjour provides more stable networking when using Windows PCs. Install [Bonjour ## Installing Java -PhotonVision requires a JDK installed and on the system path. **JDK 17 is needed. Windows Users must use the JDK that ships with WPILib.** [Download and install it from here.](https://github.com/wpilibsuite/allwpilib/releases/tag/v2025.3.1) Either ensure the only Java on your PATH is the WPILIB Java or specify it to gradle with `-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk`: +PhotonVision requires a JDK installed and on the system path. **JDK 17 is needed. Windows Users must use the JDK that ships with WPILib.** [Download and install it from here.](https://github.com/wpilibsuite/allwpilib/releases/tag/v2025.3.2) Either ensure the only Java on your PATH is the WPILIB Java or specify it to gradle with `-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk`: ``` > ./gradlew run "-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk" diff --git a/photon-lib/py/photonlibpy/simulation/photonCameraSim.py b/photon-lib/py/photonlibpy/simulation/photonCameraSim.py index 7525c9e04..a6f09b232 100644 --- a/photon-lib/py/photonlibpy/simulation/photonCameraSim.py +++ b/photon-lib/py/photonlibpy/simulation/photonCameraSim.py @@ -477,11 +477,11 @@ class PhotonCameraSim: intrinsics = self.prop.getIntrinsics() intrinsicsView = intrinsics.flatten().tolist() - self.ts.cameraIntrinsicsPublisher.set(intrinsicsView, receiveTimestamp_us) + self.ts.cameraIntrinsicsPublisher.set(list(intrinsicsView), receiveTimestamp_us) distortion = self.prop.getDistCoeffs() distortionView = distortion.flatten().tolist() - self.ts.cameraDistortionPublisher.set(distortionView, receiveTimestamp_us) + self.ts.cameraDistortionPublisher.set(list(distortionView), receiveTimestamp_us) self.ts.heartbeatPublisher.set(self.heartbeatCounter, receiveTimestamp_us) self.heartbeatCounter += 1 diff --git a/photon-lib/py/setup.py b/photon-lib/py/setup.py index 09408e6dd..f2e3d278a 100644 --- a/photon-lib/py/setup.py +++ b/photon-lib/py/setup.py @@ -61,11 +61,11 @@ setup( version=versionString, install_requires=[ "numpy~=2.1", - "wpilib<2026,>=2025.3.1", - "robotpy-wpimath<2026,>=2025.3.1", - "robotpy-apriltag<2026,>=2025.3.1", - "robotpy-cscore<2026,>=2025.3.1", - "pyntcore<2026,>=2025.3.1", + "wpilib<2026,>=2025.3.2", + "robotpy-wpimath<2026,>=2025.3.2", + "robotpy-apriltag<2026,>=2025.3.2", + "robotpy-cscore<2026,>=2025.3.2", + "pyntcore<2026,>=2025.3.2", "opencv-python;platform_machine!='roborio'", ], description=descriptionStr, diff --git a/photonlib-cpp-examples/aimandrange/build.gradle b/photonlib-cpp-examples/aimandrange/build.gradle index 2d37126ea..0c20a5cdd 100644 --- a/photonlib-cpp-examples/aimandrange/build.gradle +++ b/photonlib-cpp-examples/aimandrange/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.3.1" + id "edu.wpi.first.GradleRIO" version "2025.3.2" } repositories { @@ -11,8 +11,8 @@ repositories { wpi.maven.useLocal = false wpi.maven.useDevelopment = false -wpi.versions.wpilibVersion = "2025.3.1" -wpi.versions.wpimathVersion = "2025.3.1" +wpi.versions.wpilibVersion = "2025.3.2" +wpi.versions.wpimathVersion = "2025.3.2" // Define my targets (RoboRIO) and artifacts (deployable files) // This is added by GradleRIO's backing project DeployUtils. diff --git a/photonlib-cpp-examples/aimattarget/build.gradle b/photonlib-cpp-examples/aimattarget/build.gradle index 2d37126ea..0c20a5cdd 100644 --- a/photonlib-cpp-examples/aimattarget/build.gradle +++ b/photonlib-cpp-examples/aimattarget/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.3.1" + id "edu.wpi.first.GradleRIO" version "2025.3.2" } repositories { @@ -11,8 +11,8 @@ repositories { wpi.maven.useLocal = false wpi.maven.useDevelopment = false -wpi.versions.wpilibVersion = "2025.3.1" -wpi.versions.wpimathVersion = "2025.3.1" +wpi.versions.wpilibVersion = "2025.3.2" +wpi.versions.wpimathVersion = "2025.3.2" // Define my targets (RoboRIO) and artifacts (deployable files) // This is added by GradleRIO's backing project DeployUtils. diff --git a/photonlib-cpp-examples/poseest/build.gradle b/photonlib-cpp-examples/poseest/build.gradle index 2d37126ea..0c20a5cdd 100644 --- a/photonlib-cpp-examples/poseest/build.gradle +++ b/photonlib-cpp-examples/poseest/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.3.1" + id "edu.wpi.first.GradleRIO" version "2025.3.2" } repositories { @@ -11,8 +11,8 @@ repositories { wpi.maven.useLocal = false wpi.maven.useDevelopment = false -wpi.versions.wpilibVersion = "2025.3.1" -wpi.versions.wpimathVersion = "2025.3.1" +wpi.versions.wpilibVersion = "2025.3.2" +wpi.versions.wpimathVersion = "2025.3.2" // Define my targets (RoboRIO) and artifacts (deployable files) // This is added by GradleRIO's backing project DeployUtils. diff --git a/photonlib-java-examples/aimandrange/build.gradle b/photonlib-java-examples/aimandrange/build.gradle index 7d5921229..274072eb0 100644 --- a/photonlib-java-examples/aimandrange/build.gradle +++ b/photonlib-java-examples/aimandrange/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.3.1" + id "edu.wpi.first.GradleRIO" version "2025.3.2" } sourceCompatibility = JavaVersion.VERSION_17 @@ -13,8 +13,8 @@ repositories { } wpi.maven.useDevelopment = true -wpi.versions.wpilibVersion = "2025.3.1" -wpi.versions.wpimathVersion = "2025.3.1" +wpi.versions.wpilibVersion = "2025.3.2" +wpi.versions.wpimathVersion = "2025.3.2" // Define my targets (RoboRIO) and artifacts (deployable files) diff --git a/photonlib-java-examples/aimattarget/build.gradle b/photonlib-java-examples/aimattarget/build.gradle index cf526cea7..15409f7cd 100644 --- a/photonlib-java-examples/aimattarget/build.gradle +++ b/photonlib-java-examples/aimattarget/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.3.1" + id "edu.wpi.first.GradleRIO" version "2025.3.2" } sourceCompatibility = JavaVersion.VERSION_17 @@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_17 def ROBOT_MAIN_CLASS = "frc.robot.Main" wpi.maven.useDevelopment = true -wpi.versions.wpilibVersion = "2025.3.1" -wpi.versions.wpimathVersion = "2025.3.1" +wpi.versions.wpilibVersion = "2025.3.2" +wpi.versions.wpimathVersion = "2025.3.2" // Define my targets (RoboRIO) and artifacts (deployable files) diff --git a/photonlib-java-examples/poseest/build.gradle b/photonlib-java-examples/poseest/build.gradle index 525be00be..b8ee5358c 100644 --- a/photonlib-java-examples/poseest/build.gradle +++ b/photonlib-java-examples/poseest/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.3.1" + id "edu.wpi.first.GradleRIO" version "2025.3.2" } sourceCompatibility = JavaVersion.VERSION_17 @@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_17 def ROBOT_MAIN_CLASS = "frc.robot.Main" wpi.maven.useDevelopment = true -wpi.versions.wpilibVersion = "2025.3.1" -wpi.versions.wpimathVersion = "2025.3.1" +wpi.versions.wpilibVersion = "2025.3.2" +wpi.versions.wpimathVersion = "2025.3.2" // Define my targets (RoboRIO) and artifacts (deployable files) diff --git a/photonlib-python-examples/aimandrange/pyproject.toml b/photonlib-python-examples/aimandrange/pyproject.toml index 4b5a0262a..3fc8c5bde 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 = "2025.3.1" +robotpy_version = "2025.3.2" # 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 4b5a0262a..3fc8c5bde 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 = "2025.3.1" +robotpy_version = "2025.3.2" # 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 4b5a0262a..3fc8c5bde 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 = "2025.3.1" +robotpy_version = "2025.3.2" # Which extra RobotPy components should be installed # -> equivalent to `pip install robotpy[extra1, ...]