Skip to content

Commit

Permalink
Updates for 2024 beta
Browse files Browse the repository at this point in the history
  • Loading branch information
virtuald committed Nov 1, 2023
1 parent 110a370 commit 0c36bbd
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 23 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ on:

jobs:
ci:
uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2023
uses: robotpy/build-actions/.github/workflows/package-ci.yml@v2024
secrets:
SSH_USER: ${{ secrets.SSH_USER }}
SSH_KEY: ${{ secrets.SSH_KEY }}
SSH_PASSPHRASE: ${{ secrets.SSH_PASSPHRASE }}
META_REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
RTD_TOKEN: ${{ secrets.RTD_TOKEN }}
RTD_WEBHOOK: ${{ secrets.RTD_WEBHOOK }}
WPI_ARTIFACTORY_USERNAME: ${{ secrets.WPI_ARTIFACTORY_USERNAME }}
WPI_ARTIFACTORY_TOKEN: ${{ secrets.WPI_ARTIFACTORY_TOKEN }}
PYPI_API_TOKEN: ${{ secrets.PYPI_PASSWORD }}
8 changes: 6 additions & 2 deletions gen/CANSparkMax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ classes:
ignore: true
SoftLimitDirection:
FaultID:
attributes:
kFollowerDisabled:
kFollowerSparkMax:
kFollowerPhoenix:
methods:
CANSparkMax:
Set:
Expand Down Expand Up @@ -79,8 +83,8 @@ classes:
GetClosedLoopRampRate:
Follow:
overloads:
rev::CANSparkMax&, bool:
CANSparkMax::ExternalFollower, int, bool:
const CANSparkMax&, bool:
ExternalFollower, int, bool:
IsFollower:
GetFaults:
GetStickyFaults:
Expand Down
4 changes: 2 additions & 2 deletions gen/ColorMatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ classes:
SetConfidenceThreshold:
MatchColor:
overloads:
frc::Color&:
frc::Color&, double&:
const frc::Color&:
const frc::Color&, double&:
MatchClosestColor:
8 changes: 2 additions & 6 deletions gen/SparkMaxPIDController.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@ extra_includes:

classes:
SparkMaxPIDController:
ignored_bases:
- CANPIDController
typealias:
- rev::SparkMaxPIDController::ArbFFUnits
enums:
AccelStrategy:
ArbFFUnits:
methods:
SetReference:
overloads:
double, CANSparkMaxLowLevel::ControlType, int, double, rev::SparkMaxPIDController::ArbFFUnits:
double, CANSparkMaxLowLevel::ControlType, int, double, SparkMaxPIDController::ArbFFUnits:
double, ControlType, int, double, CANPIDController::ArbFFUnits:
ignore: true
SetP:
Expand Down Expand Up @@ -55,7 +51,7 @@ classes:
SetSmartMotionAllowedClosedLoopError:
SetSmartMotionAccelStrategy:
overloads:
rev::SparkMaxPIDController::AccelStrategy, int:
SparkMaxPIDController::AccelStrategy, int:
CANPIDController::AccelStrategy, int:
ignore: true
GetSmartMotionMaxVelocity:
Expand Down
18 changes: 9 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ author_email = "[email protected]"
url = "https://github.com/robotpy/robotpy-rev"
license = "BSD-3-Clause"
install_requires = [
"robotpy-wpiutil<2024.0.0,>=2023.1.1.0",
"robotpy-wpimath<2024.0.0,>=2023.1.1.0",
"wpilib<2024.0.0,>=2023.1.1.0",
"robotpy-wpiutil<2025.0.0,>=2023.1.1.0",
"robotpy-wpimath<2025.0.0,>=2023.1.1.0",
"wpilib<2025.0.0,>=2023.1.1.0",
]

[build-system]
requires = [
"robotpy-build<2024.0.0,>=2023.0.0",
"robotpy-wpiutil<2024.0.0,>=2023.1.1.0",
"robotpy-wpimath<2024.0.0,>=2023.1.1.0",
"wpilib<2024.0.0,>=2023.1.1.0",
"robotpy-build<2025.0.0,~=2024.0.0b2",
"robotpy-wpiutil<2025.0.0,>=2023.1.1.0",
"robotpy-wpimath<2025.0.0,>=2023.1.1.0",
"wpilib<2025.0.0,>=2023.1.1.0",
]

[tool.robotpy-build]
Expand All @@ -26,14 +26,14 @@ base_package = "rev"
artifact_id = "REVLib-driver"
group_id = "com.revrobotics.frc"
repo_url = "https://maven.revrobotics.com"
version = "2023.1.3"
version = "2024.0.0"
libs = ["REVLibDriver"]

[tool.robotpy-build.static_libs."revlib".maven_lib_download]
artifact_id = "REVLib-cpp"
group_id = "com.revrobotics.frc"
repo_url = "https://maven.revrobotics.com"
version = "2023.1.3"
version = "2024.0.0"
libs = ["REVLib"]

[tool.robotpy-build.wrappers."rev"]
Expand Down

0 comments on commit 0c36bbd

Please sign in to comment.