Skip to content

Commit f8c5a1f

Browse files
committed
rdev: Use 'robot' instead of 'roborio'
1 parent e65c527 commit f8c5a1f

File tree

3 files changed

+31
-27
lines changed

3 files changed

+31
-27
lines changed

devtools/config.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ class SubprojectConfig:
1010
#: The key in `py_versions` to set the project version from
1111
py_version: str
1212

13-
#: Whether this should be built on roborio or not
14-
roborio: bool
13+
#: Whether this should be built for the robot platform or not
14+
robot: bool
1515

1616
#: Whether `ci scan-headers` should include this project
1717
ci_scan_headers: bool = True
@@ -26,6 +26,8 @@ class Parameters:
2626

2727
requirements: T.Dict[str, str]
2828

29+
robot_wheel_platform: str
30+
2931

3032
@dataclasses.dataclass
3133
class UpdateConfig:

devtools/ctx.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ def __init__(self, verbose: bool) -> None:
2222
self.cfgpath = self.root_path / "rdev.toml"
2323
self.cfg, self.rawcfg = config.load(self.cfgpath)
2424

25-
self.is_roborio = sysconfig.get_platform() == "linux-roborio"
25+
self.is_robot = sysconfig.get_platform() == self.cfg.params.robot_wheel_platform
2626

2727
self.wheel_path = self.root_path / "dist"
2828
self.other_wheel_path = self.root_path / "dist-other"
2929

3030
subprojects: typing.List[Subproject] = []
3131
for project, cfg in self.cfg.subprojects.items():
32-
# Skip projects that aren't compatible with roborio
33-
if self.is_roborio and not cfg.roborio:
32+
# Skip projects that aren't compatible with the robot
33+
if self.is_robot and not cfg.robot:
3434
continue
3535

3636
subprojects.append(Subproject(cfg, self.subprojects_path / project))

rdev.toml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ exclude_artifacts = [
3131
"opencv-cpp"
3232
]
3333

34+
robot_wheel_platform = "linux-roborio"
35+
3436
[params.requirements]
3537
semiwrap = "~=0.1.2"
3638
hatch-meson = "~=0.1.0b2"
@@ -40,92 +42,92 @@ hatch-robotpy = "~=0.2"
4042

4143
[subprojects."robotpy-native-wpiutil"]
4244
py_version = "native"
43-
roborio = true
45+
robot = true
4446

4547
[subprojects."robotpy-native-wpinet"]
4648
py_version = "native"
47-
roborio = true
49+
robot = true
4850

4951
[subprojects."robotpy-native-ntcore"]
5052
py_version = "native"
51-
roborio = true
53+
robot = true
5254

5355
[subprojects."robotpy-native-wpihal"]
5456
py_version = "native"
55-
roborio = true
57+
robot = true
5658

5759
[subprojects."robotpy-native-wpimath"]
5860
py_version = "native"
59-
roborio = true
61+
robot = true
6062

6163
[subprojects."robotpy-native-apriltag"]
6264
py_version = "native"
63-
roborio = true
65+
robot = true
6466

6567
[subprojects."robotpy-native-wpilib"]
6668
py_version = "native"
67-
roborio = true
69+
robot = true
6870

6971
[subprojects."robotpy-native-romi"]
7072
py_version = "native"
71-
roborio = false
73+
robot = false
7274

7375
[subprojects."robotpy-native-xrp"]
7476
py_version = "native"
75-
roborio = false
77+
robot = false
7678

7779
[subprojects."robotpy-wpiutil"]
7880
py_version = "wrapper"
79-
roborio = true
81+
robot = true
8082

8183
[subprojects."robotpy-wpinet"]
8284
py_version = "wrapper"
83-
roborio = true
85+
robot = true
8486

8587
[subprojects."pyntcore"]
8688
py_version = "wrapper"
87-
roborio = true
89+
robot = true
8890

8991
[subprojects."robotpy-hal"]
9092
py_version = "wrapper"
91-
roborio = true
93+
robot = true
9294

9395
[subprojects."robotpy-wpimath"]
9496
py_version = "wrapper"
95-
roborio = true
97+
robot = true
9698

9799
[subprojects."robotpy-cscore"]
98100
py_version = "wrapper"
99-
roborio = true
101+
robot = true
100102

101103
# practicality over purity - this is because we use a static
102104
# library that only exists at build time
103105
ci_scan_headers = false
104106

105107
[subprojects."robotpy-apriltag"]
106108
py_version = "wrapper"
107-
roborio = true
109+
robot = true
108110

109111
[subprojects."robotpy-wpilib"]
110112
py_version = "wrapper"
111-
roborio = true
113+
robot = true
112114

113115
[subprojects."robotpy-halsim-ds-socket"]
114116
py_version = "halsim_native"
115-
roborio = false
117+
robot = false
116118

117119
[subprojects."robotpy-halsim-ws"]
118120
py_version = "halsim_native"
119-
roborio = false
121+
robot = false
120122

121123
[subprojects."robotpy-halsim-gui"]
122124
py_version = "wrapper"
123-
roborio = false
125+
robot = false
124126

125127
[subprojects."robotpy-romi"]
126128
py_version = "wrapper"
127-
roborio = false
129+
robot = false
128130

129131
[subprojects."robotpy-xrp"]
130132
py_version = "wrapper"
131-
roborio = false
133+
robot = false

0 commit comments

Comments
 (0)