Merge pull request #115 from robotpy/2025-beta-3

virtuald · web-flow · commit 345fb63f2069 · 2024-12-19T02:47:23.000-05:00
Update to 2025 beta 3
diff --git a/rdev.toml b/rdev.toml
@@ -5,15 +5,15 @@
 [params]
 
 # wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release"
-wpilib_bin_version = "2025.1.1-beta-2"
+wpilib_bin_version = "2025.1.1-beta-3"
 wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development"
 
 # Don't update these artifacts
 exclude_artifacts = [
     "opencv-cpp"
 ]
 
-robotpy_build_req = "<2025.0.0b1,~=2025.0.0a4"
+robotpy_build_req = "<2025.0.0b1,~=2025.0.0a6"
 
 #
 # Subproject configuration
diff --git a/subprojects/pyntcore/pyproject.toml b/subprojects/pyntcore/pyproject.toml
@@ -12,7 +12,7 @@ install_requires = [
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "robotpy-wpiutil~=2025.0.0b2",
     "robotpy-wpinet~=2025.0.0b2",
 ]
@@ -37,7 +37,7 @@ scan_headers_ignore = [
 artifact_id = "ntcore-cpp"
 group_id = "edu.wpi.first.ntcore"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 libs = ["ntcore"]
 
diff --git a/subprojects/robotpy-apriltag/pyproject.toml b/subprojects/robotpy-apriltag/pyproject.toml
@@ -12,7 +12,7 @@ install_requires = [
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "robotpy-wpiutil~=2025.0.0b2",
     "robotpy-wpimath~=2025.0.0b2",
 ]
@@ -40,7 +40,7 @@ scan_headers_ignore = [
 artifact_id = "apriltag-cpp"
 group_id = "edu.wpi.first.apriltag"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 libs = ["apriltag"]
 
diff --git a/subprojects/robotpy-cscore/pyproject.toml b/subprojects/robotpy-cscore/pyproject.toml
@@ -13,7 +13,7 @@ install_requires = [
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "robotpy-wpiutil~=2025.0.0b2",
     "robotpy-wpinet~=2025.0.0b2",
     "pyntcore~=2025.0.0b2",
@@ -30,15 +30,15 @@ update_init = [
 artifact_id = "cscore-cpp"
 group_id = "edu.wpi.first.cscore"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 libs = ["cscore"]
 
 [tool.robotpy-build.static_libs."cameraserver_cpp".maven_lib_download]
 artifact_id = "cameraserver-cpp"
 group_id = "edu.wpi.first.cameraserver"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 libs = ["cameraserver"]
 
diff --git a/subprojects/robotpy-hal/pyproject.toml b/subprojects/robotpy-hal/pyproject.toml
@@ -11,7 +11,7 @@ install_requires = [
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "robotpy-wpiutil~=2025.0.0b2",
 ]
 
@@ -53,7 +53,7 @@ artifact_id = "hal-cpp"
 group_id = "edu.wpi.first.hal"
 # repo_url = "https://frcmaven.wpi.edu/artifactory/release"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 libs = ["wpiHal"]
 
diff --git a/subprojects/robotpy-halsim-ds-socket/pyproject.toml b/subprojects/robotpy-halsim-ds-socket/pyproject.toml
@@ -15,7 +15,7 @@ robotpysimext = ["ds-socket = halsim_ds_socket"]
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "robotpy-hal~=2025.0.0b2",
     "robotpy-wpinet~=2025.0.0b2",
 ]
@@ -28,7 +28,7 @@ artifact_id = "halsim_ds_socket"
 group_id = "edu.wpi.first.halsim"
 # repo_url = "https://frcmaven.wpi.edu/artifactory/release"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 dlopenlibs = ["halsim_ds_socket"]
 
diff --git a/subprojects/robotpy-halsim-gui/pyproject.toml b/subprojects/robotpy-halsim-gui/pyproject.toml
@@ -14,7 +14,7 @@ install_requires = [
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "robotpy-wpiutil~=2025.0.0b2",
     "robotpy-wpimath~=2025.0.0b2",
     "robotpy-hal~=2025.0.0b2",
@@ -30,7 +30,7 @@ artifact_id = "halsim_gui"
 group_id = "edu.wpi.first.halsim"
 # repo_url = "https://frcmaven.wpi.edu/artifactory/release"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 dlopenlibs = ["halsim_gui"]
 
diff --git a/subprojects/robotpy-halsim-ws/pyproject.toml b/subprojects/robotpy-halsim-ws/pyproject.toml
@@ -19,7 +19,7 @@ robotpysimext = [
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "robotpy-hal~=2025.0.0b2",
     "robotpy-wpinet~=2025.0.0b2",
 ]
@@ -32,7 +32,7 @@ artifact_id = "halsim_ws_server"
 group_id = "edu.wpi.first.halsim"
 # repo_url = "https://frcmaven.wpi.edu/artifactory/release"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 dlopenlibs = ["halsim_ws_server"]
 
@@ -45,7 +45,7 @@ artifact_id = "halsim_ws_client"
 group_id = "edu.wpi.first.halsim"
 # repo_url = "https://frcmaven.wpi.edu/artifactory/release"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 dlopenlibs = ["halsim_ws_client"]
 
diff --git a/subprojects/robotpy-romi/pyproject.toml b/subprojects/robotpy-romi/pyproject.toml
@@ -11,7 +11,7 @@ install_requires = [
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "wpilib~=2025.0.0b2"
 ]
 
@@ -39,5 +39,5 @@ artifact_id = "romiVendordep-cpp"
 group_id = "edu.wpi.first.romiVendordep"
 # repo_url = "https://frcmaven.wpi.edu/artifactory/release"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 libs = ["romiVendordep"]
diff --git a/subprojects/robotpy-wpilib/pyproject.toml b/subprojects/robotpy-wpilib/pyproject.toml
@@ -18,7 +18,7 @@ robotpy = ["run = wpilib._impl.start:Main"]
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "robotpy-wpiutil~=2025.0.0b2",
     "robotpy-wpimath~=2025.0.0b2",
     "robotpy-hal~=2025.0.0b2",
@@ -69,7 +69,7 @@ scan_headers_ignore = [
 artifact_id = "wpilibc-cpp"
 group_id = "edu.wpi.first.wpilibc"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 libs = ["wpilibc"]
 
diff --git a/subprojects/robotpy-wpimath/pyproject.toml b/subprojects/robotpy-wpimath/pyproject.toml
@@ -11,7 +11,7 @@ install_requires = [
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "robotpy-wpiutil~=2025.0.0b2",
     # "numpy", # broken in raspbian CI
 ]
@@ -81,7 +81,7 @@ scan_headers_ignore = [
 artifact_id = "wpimath-cpp"
 group_id = "edu.wpi.first.wpimath"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 
 libs = ["wpimath"]
diff --git a/subprojects/robotpy-wpinet/pyproject.toml b/subprojects/robotpy-wpinet/pyproject.toml
@@ -20,7 +20,7 @@ artifact_id = "wpinet-cpp"
 group_id = "edu.wpi.first.wpinet"
 # repo_url = "https://frcmaven.wpi.edu/artifactory/release"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 libs = ["wpinet"]
 
@@ -41,6 +41,6 @@ install_requires = [
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "robotpy-wpiutil~=2025.0.0b2",
 ]
diff --git a/subprojects/robotpy-wpiutil/pyproject.toml b/subprojects/robotpy-wpiutil/pyproject.toml
@@ -9,7 +9,7 @@ install_requires = []
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
 ]
 
 [tool.robotpy-build]
@@ -51,7 +51,7 @@ artifact_id = "wpiutil-cpp"
 group_id = "edu.wpi.first.wpiutil"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
 # repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 libs = ["wpiutil"]
 
diff --git a/subprojects/robotpy-xrp/pyproject.toml b/subprojects/robotpy-xrp/pyproject.toml
@@ -16,7 +16,7 @@ robotpysimext = [
 
 [build-system]
 requires = [
-    "robotpy-build<2025.0.0b1,~=2025.0.0a4",
+    "robotpy-build<2025.0.0b1,~=2025.0.0a6",
     "wpilib~=2025.0.0b2"
 ]
 
@@ -48,15 +48,15 @@ artifact_id = "xrpVendordep-cpp"
 group_id = "edu.wpi.first.xrpVendordep"
 # repo_url = "https://frcmaven.wpi.edu/artifactory/release"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 libs = ["xrpVendordep"]
 
 [tool.robotpy-build.wrappers."xrp.extension".maven_lib_download]
 artifact_id = "halsim_xrp"
 group_id = "edu.wpi.first.halsim"
 # repo_url = "https://frcmaven.wpi.edu/artifactory/release"
 repo_url = "https://frcmaven.wpi.edu/artifactory/development"
-version = "2025.1.1-beta-2"
+version = "2025.1.1-beta-3"
 
 dlopenlibs = ["halsim_xrp"]
 

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@`
`5`	`5`	`[params]`
`6`	`6`
`7`	`7`	`# wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release"`
`8`		`-wpilib_bin_version = "2025.1.1-beta-2"`
	`8`	`+wpilib_bin_version = "2025.1.1-beta-3"`
`9`	`9`	`wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development"`
`10`	`10`
`11`	`11`	`# Don't update these artifacts`
`12`	`12`	`exclude_artifacts = [`
`13`	`13`	`"opencv-cpp"`
`14`	`14`	`]`
`15`	`15`
`16`		`-robotpy_build_req = "<2025.0.0b1,~=2025.0.0a4"`
	`16`	`+robotpy_build_req = "<2025.0.0b1,~=2025.0.0a6"`
`17`	`17`
`18`	`18`	`#`
`19`	`19`	`# Subproject configuration`