From 710f4b78139fa2c0622c48ea1f5de590c65d3012 Mon Sep 17 00:00:00 2001 From: David Vo Date: Tue, 20 Feb 2024 00:08:08 +1100 Subject: [PATCH] Require wpilib 2024.3.1 --- commands2/sysid/sysidroutine.py | 8 ++------ setup.py | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/commands2/sysid/sysidroutine.py b/commands2/sysid/sysidroutine.py index 35e9359..6b1b2b3 100644 --- a/commands2/sysid/sysidroutine.py +++ b/commands2/sysid/sysidroutine.py @@ -135,9 +135,7 @@ def end(interrupted: bool): self.mechanism.subsystem.runOnce(timer.restart) .andThen(self.mechanism.subsystem.run(execute)) .finallyDo(end) - .withName( - f"sysid-{SysIdRoutineLog.stateEnumToString(state)}-{self.mechanism.name}" - ) + .withName(f"sysid-{state}-{self.mechanism.name}") .withTimeout(self.config.timeout) ) @@ -174,8 +172,6 @@ def end(interrupted: bool): self.mechanism.subsystem.runOnce(command) .andThen(self.mechanism.subsystem.run(execute)) .finallyDo(end) - .withName( - f"sysid-{SysIdRoutineLog.stateEnumToString(state)}-{self.mechanism.name}" - ) + .withName(f"sysid-{state}-{self.mechanism.name}") .withTimeout(self.config.timeout) ) diff --git a/setup.py b/setup.py index 73a2d82..7660f9d 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ package_data={"commands2": ["py.typed"]}, packages=["commands2"], install_requires=[ - "wpilib<2025,>=2024.2.1.2", + "wpilib<2025,>=2024.3.1", "typing_extensions>=4.1.0,<5", ], license="BSD-3-Clause",