Skip to content

Commit 1318d87

Browse files
virtualdvirtuald
authored
Merge pull request #100 from robotpy/2025-dev
2025 WPILib updates
2 parents f82f8c1 + 5b9c72b commit 1318d87

File tree

137 files changed

+1206
-407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1206
-407
lines changed

‎.github/workflows/dist.yml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
- uses: actions/setup-python@v5
4646
with:
47-
python-version: "3.12"
47+
python-version: "3.13"
4848

4949
- name: Install deps
5050
shell: bash
@@ -68,13 +68,13 @@ jobs:
6868
max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
6969
fail-fast: true
7070
matrix:
71-
os: ["ubuntu-22.04", "macos-12", "windows-2022"]
71+
os: ["ubuntu-22.04", "macos-13", "windows-2022"]
7272
python_version:
73-
- '3.8'
7473
- '3.9'
7574
- '3.10'
7675
- '3.11'
7776
- '3.12'
77+
- '3.13'
7878

7979
steps:
8080
- uses: actions/checkout@v4
@@ -114,7 +114,7 @@ jobs:
114114
- name: Install numpy (needed for stubgen but broken in raspbian CI)
115115
shell: bash
116116
run: |
117-
python -m pip --disable-pip-version-check install 'numpy<2'
117+
python -m pip --disable-pip-version-check install numpy
118118
119119
- name: Build + test wheels
120120
shell: bash
@@ -169,30 +169,30 @@ jobs:
169169
max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
170170
matrix:
171171
os:
172-
- container: wpilib/roborio-cross-ubuntu:2024-22.04-py312
172+
- container: wpilib/roborio-cross-ubuntu:2025-22.04-py313
173173
name: roborio
174174

175-
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py38
176-
name: raspbian-py38
177-
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py39
175+
- container: wpilib/raspbian-cross-ubuntu:2025-bullseye-22.04-py39
178176
name: raspbian-py39
179-
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py310
177+
- container: wpilib/raspbian-cross-ubuntu:2025-bullseye-22.04-py310
180178
name: raspbian-py310
181-
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py311
179+
- container: wpilib/raspbian-cross-ubuntu:2025-bullseye-22.04-py311
182180
name: raspbian-py311
183-
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py312
181+
- container: wpilib/raspbian-cross-ubuntu:2025-bullseye-22.04-py312
184182
name: raspbian-py312
185-
186-
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py38
187-
name: raspbian-aarch64-py38
188-
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py39
183+
- container: wpilib/raspbian-cross-ubuntu:2025-bullseye-22.04-py313
184+
name: raspbian-py313
185+
186+
- container: wpilib/aarch64-cross-ubuntu:2025-bullseye-22.04-py39
189187
name: raspbian-aarch64-py39
190-
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py310
188+
- container: wpilib/aarch64-cross-ubuntu:2025-bullseye-22.04-py310
191189
name: raspbian-aarch64-py310
192-
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py311
190+
- container: wpilib/aarch64-cross-ubuntu:2025-bullseye-22.04-py311
193191
name: raspbian-aarch64-py311
194-
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py312
192+
- container: wpilib/aarch64-cross-ubuntu:2025-bullseye-22.04-py312
195193
name: raspbian-aarch64-py312
194+
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py313
195+
name: raspbian-aarch64-py313
196196

197197
container:
198198
image: "${{ matrix.os.container }}"
@@ -222,7 +222,13 @@ jobs:
222222
run: |
223223
pwd
224224
/usr/bin/git config --global --add safe.directory $(pwd)
225-
225+
226+
# See https://github.com/pallets/markupsafe/issues/475
227+
- name: Install MarkupSafe
228+
shell: bash
229+
run: |
230+
/build/venv/bin/cross-pip install --no-build-isolation "markupsafe; python_version < '3.12'"
231+
226232
- name: Install deps
227233
shell: bash
228234
run: |

‎devtools/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# MACOSX_DEPLOYMENT_TARGET is required for linking to WPILib
1818
if sys.platform == "darwin":
19-
os.environ["MACOSX_DEPLOYMENT_TARGET"] = "12"
19+
os.environ["MACOSX_DEPLOYMENT_TARGET"] = "13"
2020

2121

2222
@click.group()

‎rdev.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
[params]
66

7-
wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release"
8-
wpilib_bin_version = "2024.3.2"
9-
# wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development"
7+
# wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release"
8+
wpilib_bin_version = "2025.1.1-beta-1"
9+
wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development"
1010

1111
# Don't update these artifacts
1212
exclude_artifacts = [
1313
"opencv-cpp"
1414
]
1515

16-
robotpy_build_req = "<2025.0.0,~=2024.0.0"
16+
robotpy_build_req = "<2025.0.0b1,~=2025.0.0a1"
1717

1818
#
1919
# Subproject configuration

‎rdev_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ black
22
click
33
packaging
44
pydantic<2
5+
pytest
56
requests
67
setuptools
78
setuptools_scm >= 6.2, < 8

‎subprojects/pyntcore/gen/NetworkTableInstance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ classes:
144144
StopClient:
145145
SetServer:
146146
overloads:
147-
const char*, unsigned int:
147+
std::string_view, unsigned int:
148148
std::span<const std::pair<std::string_view, unsigned int>>:
149149
std::span<const std::string_view>, unsigned int:
150150
SetServerTeam:

‎subprojects/pyntcore/ntcore/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from . import _init_ntcore
22

3-
# autogenerated by 'robotpy-build create-imports ntcore'
3+
# autogenerated by 'robotpy-build create-imports ntcore ntcore._ntcore'
44
from ._ntcore import (
55
BooleanArrayEntry,
66
BooleanArrayPublisher,

‎subprojects/pyntcore/pyproject.toml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,32 @@ install_requires = [
1212

1313
[build-system]
1414
requires = [
15-
"robotpy-build<2025.0.0,~=2024.0.0",
15+
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
1616
"robotpy-wpiutil~=2024.3.1",
1717
"robotpy-wpinet~=2024.3.1",
1818
]
1919

2020
[tool.robotpy-build]
2121
base_package = "ntcore"
22+
update_init = [
23+
"ntcore",
24+
"ntcore.meta ntcore._ntcore.meta"
25+
]
26+
scan_headers_ignore = [
27+
"networktables/ProtobufTopic.h",
28+
"networktables/UnitTopic.h",
29+
30+
"ntcore.h",
31+
"ntcore_c.h",
32+
"ntcore_c_types.h",
33+
"ntcore_test.h",
34+
]
2235

2336
[tool.robotpy-build.wrappers."ntcore".maven_lib_download]
2437
artifact_id = "ntcore-cpp"
2538
group_id = "edu.wpi.first.ntcore"
26-
repo_url = "https://frcmaven.wpi.edu/artifactory/release"
27-
version = "2024.3.2"
39+
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
40+
version = "2025.1.1-beta-1"
2841

2942
libs = ["ntcore"]
3043

@@ -66,11 +79,6 @@ StructArrayTopic = "networktables/StructArrayTopic.h"
6679
StringArrayTopic = "networktables/StringArrayTopic.h"
6780
StringTopic = "networktables/StringTopic.h"
6881
Topic = "networktables/Topic.h"
69-
# UnitTopic = "networktables/UnitTopic.h"
7082

71-
# ntcore = "ntcore.h"
72-
# ntcore_c = "ntcore_c.h"
73-
# ntcore_c_types = "ntcore_c_types.h"
7483
ntcore_cpp = "ntcore_cpp.h"
7584
ntcore_cpp_types = "ntcore_cpp_types.h"
76-
# ntcore_test = "ntcore_test.h"

‎subprojects/robotpy-apriltag/gen/AprilTagFieldLayout.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ functions:
55
ignore: true
66
from_json:
77
ignore: true
8+
LoadAprilTagLayoutField:
9+
ignore: true
810
classes:
911
AprilTagFieldLayout:
1012
enums:
@@ -15,6 +17,7 @@ classes:
1517
"":
1618
std::string_view:
1719
std::vector<AprilTag>, units::meter_t, units::meter_t:
20+
LoadField:
1821
GetFieldLength:
1922
GetFieldWidth:
2023
GetTags:

‎subprojects/robotpy-apriltag/pyproject.toml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,35 @@ install_requires = [
1212

1313
[build-system]
1414
requires = [
15-
"robotpy-build<2025.0.0,~=2024.0.0",
15+
"robotpy-build<2025.0.0b1,~=2025.0.0a1",
1616
"robotpy-wpiutil~=2024.3.1",
1717
"robotpy-wpimath~=2024.3.1",
1818
]
1919

2020
[tool.robotpy-build]
2121
base_package = "robotpy_apriltag"
22+
update_init = [
23+
"robotpy_apriltag robotpy_apriltag._apriltag"
24+
]
25+
scan_headers_ignore = [
26+
"common/*",
27+
"test/*",
28+
29+
"apriltag.h",
30+
"apriltag_math.h",
31+
"apriltag_pose.h",
32+
33+
"frc/apriltag/AprilTagDetector_cv.h",
34+
35+
"tag16h5.h",
36+
"tag36h11.h",
37+
]
2238

2339
[tool.robotpy-build.wrappers."robotpy_apriltag".maven_lib_download]
2440
artifact_id = "apriltag-cpp"
2541
group_id = "edu.wpi.first.apriltag"
26-
repo_url = "https://frcmaven.wpi.edu/artifactory/release"
27-
version = "2024.3.2"
42+
repo_url = "https://frcmaven.wpi.edu/artifactory/development"
43+
version = "2025.1.1-beta-1"
2844

2945
libs = ["apriltag"]
3046

‎subprojects/robotpy-apriltag/robotpy_apriltag/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
AprilTagFieldLayout,
1010
AprilTagPoseEstimate,
1111
AprilTagPoseEstimator,
12-
loadAprilTagLayoutField,
1312
)
1413

1514
__all__ = [
@@ -20,5 +19,4 @@
2019
"AprilTagFieldLayout",
2120
"AprilTagPoseEstimate",
2221
"AprilTagPoseEstimator",
23-
"loadAprilTagLayoutField",
2422
]

0 commit comments

Comments
 (0)