Merge pull request #106 from robotpy/remove-wpilib-run

Remove wpilib.run for 2024

Author: virtuald

.github/workflows/test.yml

@@ -33,8 +33,8 @@ jobs:
       matrix:
         os: ["ubuntu-22.04", "macos-12", "windows-2022"]
         python_version:
-        # - '3.8'
-        # - '3.9'
+        - '3.8'
+        - '3.9'
         - '3.10'
         - '3.11'
         - '3.12'
@@ -48,7 +48,7 @@ jobs:
     - name: Install deps
       run: |
         pip install -U pip
-        pip install 'robotpy[commands2]<2025.0.0,>=2024.0.0b3' numpy pytest
+        pip install 'robotpy[commands2]<2025.0.0,>=2024.0.0b4.post1' numpy pytest
     - name: Run tests
       run: bash run_tests.sh
       shell: bash

.gitignore

@@ -10,6 +10,9 @@ deploy.json
 .project
 .pydevproject
 
+pyproject.toml
+wpilib_preferences.json
+
 imgui.ini
 simgui*.json
 

AddressableLED/robot.py

@@ -52,7 +52,3 @@ def rainbow(self):
 
         # Check bounds
         self.rainbowFirstPixelHue %= 180
-
-
-if __name__ == "__main__":
-    wpilib.run(MyRobot)

ArcadeDrive/robot.py

@@ -33,7 +33,3 @@ def teleopPeriodic(self):
         # That means that the Y axis drives forward
         # and backward, and the X turns left and right.
         self.robotDrive.arcadeDrive(self.stick.getY(), self.stick.getX())
-
-
-if __name__ == "__main__":
-    wpilib.run(MyRobot)

ArcadeDriveXboxController/robot.py

@@ -35,7 +35,3 @@ def teleopPeriodic(self):
         self.robotDrive.arcadeDrive(
             -self.driverController.getLeftY(), -self.driverController.getRightX()
         )
-
-
-if __name__ == "__main__":
-    wpilib.run(MyRobot)

ArmBot/robot.py

@@ -14,7 +14,6 @@
 
 class MyRobot(commands2.TimedCommandRobot):
     """
-    Our default robot class, pass it to wpilib.run
     Command v2 robots are encouraged to inherit from TimedCommandRobot, which
     has an implementation of robotPeriodic which runs the scheduler for you
     """
@@ -78,7 +77,3 @@ def teleopPeriodic(self) -> None:
     def testInit(self) -> None:
         # Cancels all running commands at the start of test mode
         commands2.CommandScheduler.getInstance().cancelAll()
-
-
-if __name__ == "__main__":
-    wpilib.run(MyRobot)

ArmBotOffboard/robot.py

@@ -14,7 +14,6 @@
 
 class MyRobot(commands2.TimedCommandRobot):
     """
-    Our default robot class, pass it to wpilib.run
     Command v2 robots are encouraged to inherit from TimedCommandRobot, which
     has an implementation of robotPeriodic which runs the scheduler for you
     """
@@ -65,7 +64,3 @@ def teleopPeriodic(self) -> None:
     def testInit(self) -> None:
         # Cancels all running commands at the start of test mode
         commands2.CommandScheduler.getInstance().cancelAll()
-
-
-if __name__ == "__main__":
-    wpilib.run(MyRobot)

ArmSimulation/robot.py

@@ -30,7 +30,3 @@ def teleopPeriodic(self):
     def disabledInit(self):
         # This just makes sure that our simulation code knows that the motor's off.
         self.arm.stop()
-
-
-if __name__ == "__main__":
-    wpilib.run(MyRobot)

CANPDP/robot.py

@@ -53,7 +53,3 @@ def robotPeriodic(self):
         # Energy is the power summed over time with units Joules.
         totalEnergy = self.pdp.getTotalEnergy()
         wpilib.SmartDashboard.putNumber("Total Energy", totalEnergy)
-
-
-if __name__ == "__main__":
-    wpilib.run(MyRobot)

CONTRIBUTING.md

@@ -26,8 +26,9 @@ Testing:
 General:
 
 * We always try to stay as close to the original examples as possible
-* `Main.java` is never needed, it is equivalent to `wpilib.run(MyRobot)`
+* `Main.java` is never needed
 * `robot.py` should have `#!/usr/bin/env python3` as the very first line
+  * This will go away soon as it is no longer needed in 2024
   * Note: Other files such as `vision.py` or `robotcontainer.py` should not start with `#!/usr/bin/env python3`
 * Don't ever check in files for your IDE (.vscode, .idea, etc)
 * Copy over the copyright statement from the original file