Skip to content

chore: bump wpilib to 2025.3.2 and fix mypy errors #1819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcm001 merged 8 commits into from
Mar 19, 2025
Merged

chore: bump wpilib to 2025.3.2 and fix mypy errors #1819

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
095c52c
chore: bump wpilib to 2025.3.2
samfreund Mar 19, 2025
56ebee9
fix python type errors
samfreund Mar 19, 2025
32f7ed5
the docs tell me this should work
samfreund Mar 19, 2025
31e8f99
the docs lied
samfreund Mar 19, 2025
3c56d9b
maybe this?
samfreund Mar 19, 2025
efe85d7
back to where it was originally
samfreund Mar 19, 2025
c86734c
?
samfreund Mar 19, 2025
ba2ec98
Merge branch 'main' into main
samfreund Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/source/docs/advanced-installation/sw_install/windows-pc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions photon-lib/py/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
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,
Expand Down
6 changes: 3 additions & 3 deletions photonlib-cpp-examples/aimandrange/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions photonlib-cpp-examples/aimattarget/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions photonlib-cpp-examples/poseest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions photonlib-java-examples/aimandrange/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions photonlib-java-examples/aimattarget/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions photonlib-java-examples/poseest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion photonlib-python-examples/aimandrange/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, ...]
Expand Down
2 changes: 1 addition & 1 deletion photonlib-python-examples/aimattarget/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, ...]
Expand Down
2 changes: 1 addition & 1 deletion photonlib-python-examples/poseest/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, ...]
Expand Down
Loading