Skip to content

Commit 98f5e98

Browse files
committed
Updates for 2024 beta
1 parent 110a370 commit 98f5e98

File tree

5 files changed

+24
-23
lines changed

5 files changed

+24
-23
lines changed

.github/workflows/dist.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ on:
1111

1212
jobs:
1313
ci:
14-
uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2023
14+
uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2024
15+
with:
16+
artifactory_repo_type: vendor
1517
secrets:
16-
SSH_USER: ${{ secrets.SSH_USER }}
17-
SSH_KEY: ${{ secrets.SSH_KEY }}
18-
SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }}
1918
META_REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
2019
RTD_TOKEN: ${{ secrets.RTD_TOKEN }}
2120
RTD_WEBHOOK: ${{ secrets.RTD_WEBHOOK }}
21+
WPI_ARTIFACTORY_USERNAME: ${{ secrets.WPI_ARTIFACTORY_USERNAME }}
22+
WPI_ARTIFACTORY_TOKEN: ${{ secrets.WPI_ARTIFACTORY_TOKEN }}
2223
PYPI_API_TOKEN: ${{ secrets.PYPI_PASSWORD }}

gen/CANSparkMax.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ classes:
1010
ignore: true
1111
SoftLimitDirection:
1212
FaultID:
13+
attributes:
14+
kFollowerDisabled:
15+
kFollowerSparkMax:
16+
kFollowerPhoenix:
1317
methods:
1418
CANSparkMax:
1519
Set:
@@ -79,8 +83,8 @@ classes:
7983
GetClosedLoopRampRate:
8084
Follow:
8185
overloads:
82-
rev::CANSparkMax&, bool:
83-
CANSparkMax::ExternalFollower, int, bool:
86+
const CANSparkMax&, bool:
87+
ExternalFollower, int, bool:
8488
IsFollower:
8589
GetFaults:
8690
GetStickyFaults:

gen/ColorMatch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ classes:
88
SetConfidenceThreshold:
99
MatchColor:
1010
overloads:
11-
frc::Color&:
12-
frc::Color&, double&:
11+
const frc::Color&:
12+
const frc::Color&, double&:
1313
MatchClosestColor:

gen/SparkMaxPIDController.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@ extra_includes:
55

66
classes:
77
SparkMaxPIDController:
8-
ignored_bases:
9-
- CANPIDController
10-
typealias:
11-
- rev::SparkMaxPIDController::ArbFFUnits
128
enums:
139
AccelStrategy:
1410
ArbFFUnits:
1511
methods:
1612
SetReference:
1713
overloads:
18-
double, CANSparkMaxLowLevel::ControlType, int, double, rev::SparkMaxPIDController::ArbFFUnits:
14+
double, CANSparkMaxLowLevel::ControlType, int, double, SparkMaxPIDController::ArbFFUnits:
1915
double, ControlType, int, double, CANPIDController::ArbFFUnits:
2016
ignore: true
2117
SetP:
@@ -55,7 +51,7 @@ classes:
5551
SetSmartMotionAllowedClosedLoopError:
5652
SetSmartMotionAccelStrategy:
5753
overloads:
58-
rev::SparkMaxPIDController::AccelStrategy, int:
54+
SparkMaxPIDController::AccelStrategy, int:
5955
CANPIDController::AccelStrategy, int:
6056
ignore: true
6157
GetSmartMotionMaxVelocity:

pyproject.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ author_email = "robotpy@googlegroups.com"
66
url = "https://github.com/robotpy/robotpy-rev"
77
license = "BSD-3-Clause"
88
install_requires = [
9-
"robotpy-wpiutil<2024.0.0,>=2023.1.1.0",
10-
"robotpy-wpimath<2024.0.0,>=2023.1.1.0",
11-
"wpilib<2024.0.0,>=2023.1.1.0",
9+
"robotpy-wpiutil<2025.0.0,>=2024.0.0b2",
10+
"robotpy-wpimath<2025.0.0,>=2024.0.0b2",
11+
"wpilib<2025.0.0,>=2024.0.0b2",
1212
]
1313

1414
[build-system]
1515
requires = [
16-
"robotpy-build<2024.0.0,>=2023.0.0",
17-
"robotpy-wpiutil<2024.0.0,>=2023.1.1.0",
18-
"robotpy-wpimath<2024.0.0,>=2023.1.1.0",
19-
"wpilib<2024.0.0,>=2023.1.1.0",
16+
"robotpy-build<2025.0.0,~=2024.0.0b2",
17+
"robotpy-wpiutil<2025.0.0,>=2024.0.0b2",
18+
"robotpy-wpimath<2025.0.0,>=2024.0.0b2",
19+
"wpilib<2025.0.0,>=2024.0.0b2",
2020
]
2121

2222
[tool.robotpy-build]
@@ -26,14 +26,14 @@ base_package = "rev"
2626
artifact_id = "REVLib-driver"
2727
group_id = "com.revrobotics.frc"
2828
repo_url = "https://maven.revrobotics.com"
29-
version = "2023.1.3"
29+
version = "2024.0.0"
3030
libs = ["REVLibDriver"]
3131

3232
[tool.robotpy-build.static_libs."revlib".maven_lib_download]
3333
artifact_id = "REVLib-cpp"
3434
group_id = "com.revrobotics.frc"
3535
repo_url = "https://maven.revrobotics.com"
36-
version = "2023.1.3"
36+
version = "2024.0.0"
3737
libs = ["REVLib"]
3838

3939
[tool.robotpy-build.wrappers."rev"]

0 commit comments

Comments
 (0)