Skip to content

Commit e1e705f

Browse files
authored
Merge pull request #183 from auscompgeek/update
Allow phoenix6 24.2.0 dependency
2 parents 93817e2 + 58c201b commit e1e705f

File tree

9 files changed

+6
-150
lines changed

9 files changed

+6
-150
lines changed

phoenix5/_simcancoder/__init__.py

Whitespace-only changes.

phoenix5/_simpigeonimu/__init__.py

Whitespace-only changes.

phoenix5/_simprocancoder/__init__.py

Whitespace-only changes.

phoenix5/_simpropigeon2/__init__.py

Whitespace-only changes.

phoenix5/_simprotalonfx/__init__.py

Whitespace-only changes.

phoenix5/_simtalonfx/__init__.py

Whitespace-only changes.

phoenix5/_simtalonsrx/__init__.py

Whitespace-only changes.

phoenix5/_simvictorspx/__init__.py

Whitespace-only changes.

pyproject.toml

Lines changed: 6 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ author_email = "[email protected]"
66
url = "https://github.com/robotpy/robotpy-ctre"
77
license = "MIT"
88
install_requires = [
9-
"wpilib<2025.0.0,>=2024.1.1",
10-
"phoenix6~=24.1.0",
9+
"wpilib<2025.0.0,>=2024.2.1",
10+
"phoenix6~=24.2",
1111
]
1212

1313
[build-system]
1414
requires = [
1515
"robotpy-build<2025.0.0,>=2024.0.0",
16-
"wpilib<2025.0.0,>=2024.1.1",
17-
"phoenix6~=24.1.0",
16+
"wpilib<2025.0.0,>=2024.2.1",
17+
"phoenix6~=24.2",
1818
]
1919

2020
[tool.robotpy-build]
@@ -101,7 +101,7 @@ ignore = false
101101
artifact_id = "tools"
102102
group_id = "com.ctre.phoenix6"
103103
repo_url = "https://maven.ctr-electronics.com/release"
104-
version = "24.1.0"
104+
version = "24.2.0"
105105
libs = []
106106

107107
[tool.robotpy-build.wrappers."phoenix5._wpiapi_cpp_sim"]
@@ -172,14 +172,6 @@ libs = [
172172
[tool.robotpy-build.wrappers."phoenix5._tools_sim"]
173173
name = "ctre_tools_sim"
174174
depends = [
175-
"ctre_simpropigeon2",
176-
"ctre_simprocancoder",
177-
"ctre_simprotalonfx",
178-
"ctre_simcancoder",
179-
"ctre_simtalonfx",
180-
"ctre_simpigeonimu",
181-
"ctre_simtalonsrx",
182-
"ctre_simvictorspx",
183175
]
184176

185177
[tool.robotpy-build.wrappers."phoenix5._tools_sim".override.arch_athena]
@@ -189,140 +181,12 @@ ignore = true
189181
artifact_id = "tools-sim"
190182
group_id = "com.ctre.phoenix6.sim"
191183
repo_url = "https://maven.ctr-electronics.com/release"
192-
version = "24.1.0"
184+
version = "24.2.0"
193185
libs = []
194186
# libs = [
195187
# "CTRE_PhoenixTools_Sim",
196188
# ]
197189

198-
[tool.robotpy-build.wrappers."phoenix5._simtalonsrx"]
199-
name = "ctre_simtalonsrx"
200-
201-
[tool.robotpy-build.wrappers."phoenix5._simtalonsrx".override.arch_athena]
202-
ignore = true
203-
204-
[tool.robotpy-build.wrappers."phoenix5._simtalonsrx".maven_lib_download]
205-
artifact_id = "simTalonSRX"
206-
group_id = "com.ctre.phoenix6.sim"
207-
repo_url = "https://maven.ctr-electronics.com/release"
208-
version = "24.1.0"
209-
libs = []
210-
# libs = [
211-
# "CTRE_SimTalonSRX",
212-
# ]
213-
214-
[tool.robotpy-build.wrappers."phoenix5._simtalonfx"]
215-
name = "ctre_simtalonfx"
216-
217-
[tool.robotpy-build.wrappers."phoenix5._simtalonfx".override.arch_athena]
218-
ignore = true
219-
220-
[tool.robotpy-build.wrappers."phoenix5._simtalonfx".maven_lib_download]
221-
artifact_id = "simTalonFX"
222-
group_id = "com.ctre.phoenix6.sim"
223-
repo_url = "https://maven.ctr-electronics.com/release"
224-
version = "24.1.0"
225-
libs = []
226-
# libs = [
227-
# "CTRE_SimTalonFX",
228-
# ]
229-
230-
[tool.robotpy-build.wrappers."phoenix5._simvictorspx"]
231-
name = "ctre_simvictorspx"
232-
233-
[tool.robotpy-build.wrappers."phoenix5._simvictorspx".override.arch_athena]
234-
ignore = true
235-
236-
[tool.robotpy-build.wrappers."phoenix5._simvictorspx".maven_lib_download]
237-
artifact_id = "simVictorSPX"
238-
group_id = "com.ctre.phoenix6.sim"
239-
repo_url = "https://maven.ctr-electronics.com/release"
240-
version = "24.1.0"
241-
libs = []
242-
# libs = [
243-
# "CTRE_SimVictorSPX",
244-
# ]
245-
246-
[tool.robotpy-build.wrappers."phoenix5._simpigeonimu"]
247-
name = "ctre_simpigeonimu"
248-
249-
[tool.robotpy-build.wrappers."phoenix5._simpigeonimu".override.arch_athena]
250-
ignore = true
251-
252-
[tool.robotpy-build.wrappers."phoenix5._simpigeonimu".maven_lib_download]
253-
artifact_id = "simPigeonIMU"
254-
group_id = "com.ctre.phoenix6.sim"
255-
repo_url = "https://maven.ctr-electronics.com/release"
256-
version = "24.1.0"
257-
libs = []
258-
# libs = [
259-
# "CTRE_SimPigeonIMU",
260-
# ]
261-
262-
[tool.robotpy-build.wrappers."phoenix5._simcancoder"]
263-
name = "ctre_simcancoder"
264-
265-
[tool.robotpy-build.wrappers."phoenix5._simcancoder".override.arch_athena]
266-
ignore = true
267-
268-
[tool.robotpy-build.wrappers."phoenix5._simcancoder".maven_lib_download]
269-
artifact_id = "simCANCoder"
270-
group_id = "com.ctre.phoenix6.sim"
271-
repo_url = "https://maven.ctr-electronics.com/release"
272-
version = "24.1.0"
273-
libs = []
274-
# libs = [
275-
# "CTRE_SimCANCoder",
276-
# ]
277-
278-
[tool.robotpy-build.wrappers."phoenix5._simprotalonfx"]
279-
name = "ctre_simprotalonfx"
280-
281-
[tool.robotpy-build.wrappers."phoenix5._simprotalonfx".override.arch_athena]
282-
ignore = true
283-
284-
[tool.robotpy-build.wrappers."phoenix5._simprotalonfx".maven_lib_download]
285-
artifact_id = "simProTalonFX"
286-
group_id = "com.ctre.phoenix6.sim"
287-
repo_url = "https://maven.ctr-electronics.com/release"
288-
version = "24.1.0"
289-
libs = []
290-
# libs = [
291-
# "CTRE_SimProTalonFX",
292-
# ]
293-
294-
[tool.robotpy-build.wrappers."phoenix5._simprocancoder"]
295-
name = "ctre_simprocancoder"
296-
297-
[tool.robotpy-build.wrappers."phoenix5._simprocancoder".override.arch_athena]
298-
ignore = true
299-
300-
[tool.robotpy-build.wrappers."phoenix5._simprocancoder".maven_lib_download]
301-
artifact_id = "simProCANcoder"
302-
group_id = "com.ctre.phoenix6.sim"
303-
repo_url = "https://maven.ctr-electronics.com/release"
304-
version = "24.1.0"
305-
libs = []
306-
# libs = [
307-
# "CTRE_SimProCANcoder",
308-
# ]
309-
310-
[tool.robotpy-build.wrappers."phoenix5._simpropigeon2"]
311-
name = "ctre_simpropigeon2"
312-
313-
[tool.robotpy-build.wrappers."phoenix5._simpropigeon2".override.arch_athena]
314-
ignore = true
315-
316-
[tool.robotpy-build.wrappers."phoenix5._simpropigeon2".maven_lib_download]
317-
artifact_id = "simProPigeon2"
318-
group_id = "com.ctre.phoenix6.sim"
319-
repo_url = "https://maven.ctr-electronics.com/release"
320-
version = "24.1.0"
321-
libs = []
322-
# libs = [
323-
# "CTRE_SimProPigeon2",
324-
# ]
325-
326190

327191
# End autogenerated TOML
328192

@@ -340,14 +204,6 @@ depends = [
340204
"ctre_api_cpp_sim",
341205
"ctre_cci_sim",
342206
"ctre_tools_sim",
343-
"ctre_simtalonsrx",
344-
"ctre_simtalonfx",
345-
"ctre_simvictorspx",
346-
"ctre_simpigeonimu",
347-
"ctre_simcancoder",
348-
"ctre_simprotalonfx",
349-
"ctre_simprocancoder",
350-
"ctre_simpropigeon2",
351207
]
352208

353209
sources = [

0 commit comments

Comments
 (0)