Move wpilib.command -> commands1

- Matches commands2
- Makes 'python setup.py develop' mostly work

.gitignore

@@ -9,13 +9,19 @@
 /build
 /dist
 
-/wpilib/buttons/rpy-include
-/wpilib/buttons/_init_commands_v1_buttons.py
-/wpilib/buttons/pkgcfg.py
+/commands1/buttons/rpy-include
+/commands1/buttons/_init_commands_v1_buttons.py
+/commands1/buttons/pkgcfg.py
 
-/wpilib/command/_init_commands_v1.py
-/wpilib/command/include
-/wpilib/command/lib
-/wpilib/command/rpy-include
-/wpilib/command/pkgcfg.py
-/wpilib/command/version.py
+/commands1/_init_commands_v1.py
+/commands1/include
+/commands1/lib
+/commands1/rpy-include
+/commands1/pkgcfg.py
+/commands1/version.py
+
+/commands1/_impl/pkgcfg.py
+/commands1/_impl/include
+/commands1/_impl/rpy-include
+/commands1/_impl/_init_commands_v1.py
+/commands1/py.typed

commandbased/cancelcommand.py

@@ -1,4 +1,4 @@
-from wpilib.command import Command
+from commands1 import Command
 
 
 def checkIfCanceled(self):

commandbased/commandbasedrobot.py

@@ -1,5 +1,5 @@
-from wpilib import TimedRobot
-from wpilib.command import Scheduler
+from wpilib import DriverStation, TimedRobot, reportError
+from commands1 import Scheduler
 
 
 class CommandBasedRobot(TimedRobot):
@@ -23,7 +23,7 @@ def commandPeriodic(self):
         try:
             self.scheduler.run()
         except Exception as error:
-            if not self.ds.isFMSAttached():
+            if not DriverStation.isFMSAttached():
                 raise
 
             """Just to be safe, stop all running commands."""
@@ -43,4 +43,4 @@ def handleCrash(self, error):
         more complex behavior, override this method in your robot class.
         """
 
-        self.ds.reportError(str(error), printTrace=True)
+        reportError(str(error), printTrace=True)

commandbased/flowcontrol.py

@@ -3,7 +3,7 @@
 intuitive. For more information, check each method's docstring.
 """
 
-from wpilib.command import Command, CommandGroup, ConditionalCommand
+from commands1 import Command, CommandGroup, ConditionalCommand
 from commandbased.cancelcommand import CancelCommand
 
 import inspect

commands1/__init__.py

@@ -0,0 +1,69 @@
+from ._impl import _init_commands_v1
+
+# autogenerated by 'robotpy-build create-imports commands1 commands1._impl._commands_v1.command'
+from ._impl._commands_v1.command import (
+    Command,
+    CommandGroup,
+    CommandGroupEntry,
+    ConditionalCommand,
+    InstantCommand,
+    PIDAnalogAccelerometer,
+    PIDAnalogGyro,
+    PIDAnalogInput,
+    PIDAnalogPotentiometer,
+    PIDBase,
+    PIDCommand,
+    PIDController,
+    PIDEncoder,
+    PIDInterface,
+    PIDMotorController,
+    PIDOutput,
+    PIDSource,
+    PIDSubsystem,
+    PIDUltrasonic,
+    PrintCommand,
+    Scheduler,
+    StartCommand,
+    Subsystem,
+    TimedCommand,
+    WaitCommand,
+    WaitForChildren,
+    WaitUntilCommand,
+)
+
+__all__ = [
+    "Command",
+    "CommandGroup",
+    "CommandGroupEntry",
+    "ConditionalCommand",
+    "InstantCommand",
+    "PIDAnalogAccelerometer",
+    "PIDAnalogGyro",
+    "PIDAnalogInput",
+    "PIDAnalogPotentiometer",
+    "PIDBase",
+    "PIDCommand",
+    "PIDController",
+    "PIDEncoder",
+    "PIDInterface",
+    "PIDMotorController",
+    "PIDOutput",
+    "PIDSource",
+    "PIDSubsystem",
+    "PIDUltrasonic",
+    "PrintCommand",
+    "Scheduler",
+    "StartCommand",
+    "Subsystem",
+    "TimedCommand",
+    "WaitCommand",
+    "WaitForChildren",
+    "WaitUntilCommand",
+]
+
+del _init_commands_v1
+
+try:
+    from .version import version as __version__
+except ImportError:
+    __version__ = "master"

wpilib/command/src/commands.cpp → commands1/_impl/command.cpp

@@ -1,7 +1,6 @@
-
 #include "rpygen_wrapper.hpp"
 
 RPYBUILD_PYBIND11_MODULE(m)
 {
     initWrapper(m);
-}
+}

commands1/buttons/__init__.py

@@ -0,0 +1,29 @@
+from .._impl._commands_v1.button import (
+    Button,
+    ButtonScheduler,
+    CancelButtonScheduler,
+    HeldButtonScheduler,
+    InternalButton,
+    JoystickButton,
+    NetworkButton,
+    POVButton,
+    PressedButtonScheduler,
+    ReleasedButtonScheduler,
+    ToggleButtonScheduler,
+    Trigger,
+)
+
+__all__ = [
+    "Button",
+    "ButtonScheduler",
+    "CancelButtonScheduler",
+    "HeldButtonScheduler",
+    "InternalButton",
+    "JoystickButton",
+    "NetworkButton",
+    "POVButton",
+    "PressedButtonScheduler",
+    "ReleasedButtonScheduler",
+    "ToggleButtonScheduler",
+    "Trigger",
+]

docs/.gitignore

@@ -5,7 +5,7 @@
 /_sidebar.rst.inc
 /_sidebar.toml
 
-/wpilib.buttons.rst
-/wpilib.buttons
-/wpilib.command.rst
-/wpilib.command
+/commands1.buttons.rst
+/commands1.buttons
+/commands1.rst
+/commands1

docs/api.rst

@@ -22,5 +22,5 @@ using this pattern, we recommend that you consult the Java version of the
 .. toctree::
 
   commandbased
-  wpilib.buttons
-  wpilib.command
+  commands1
+  commands1.buttons

docs/conf.py

@@ -10,7 +10,7 @@
 from os.path import abspath, dirname
 
 # Project must be built+installed to generate docs
-import wpilib.command
+import commands1
 
 # -- RTD configuration ------------------------------------------------
 
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = ".".join(wpilib.command.__version__.split(".")[:2])
+version = ".".join(commands1.__version__.split(".")[:2])
 # The full version, including alpha/beta/rc tags.
-release = wpilib.command.__version__
+release = commands1.__version__
 
 autoclass_content = "both"
 
@@ -140,5 +140,5 @@
 
 root = abspath(dirname(__file__))
 
-gen_package(root, "wpilib.buttons")
-gen_package(root, "wpilib.command")
+gen_package(root, "commands1")
+gen_package(root, "commands1.buttons")

gen/Button.yml

@@ -8,6 +8,7 @@ extra_includes:
 classes:
   Button:
     shared_ptr: true
+    subpackage: button
     methods:
       Button:
       WhenPressed:

gen/ButtonScheduler.yml

@@ -9,6 +9,7 @@ extra_includes:
 classes:
   ButtonScheduler:
     shared_ptr: true
+    subpackage: button
     attributes:
       m_pressedLast:
       m_button:

gen/CancelButtonScheduler.yml

@@ -9,6 +9,7 @@ extra_includes:
 classes:
   CancelButtonScheduler:
     shared_ptr: true
+    subpackage: button
     methods:
       CancelButtonScheduler:
         keepalive:

gen/Command.yml

@@ -9,6 +9,7 @@ classes:
     shared_ptr: true
     ignored_bases:
     - wpi::SendableHelper<Command>
+    subpackage: command
     methods:
       Command:
         overloads:

gen/CommandGroup.yml

@@ -7,6 +7,7 @@ extra_includes:
 classes:
   CommandGroup:
     shared_ptr: true
+    subpackage: command
     methods:
       CommandGroup:
         overloads:

gen/CommandGroupEntry.yml

@@ -8,6 +8,7 @@ extra_includes:
 classes:
   CommandGroupEntry:
     shared_ptr: true
+    subpackage: command
     attributes:
       m_timeout:
       m_command:

gen/ConditionalCommand.yml

@@ -8,6 +8,7 @@ extra_includes:
 classes:
   ConditionalCommand:
     shared_ptr: true
+    subpackage: command
     methods:
       ConditionalCommand:
         overloads:

gen/HeldButtonScheduler.yml

@@ -9,6 +9,7 @@ extra_includes:
 classes:
   HeldButtonScheduler:
     shared_ptr: true
+    subpackage: button
     methods:
       HeldButtonScheduler:
         keepalive:

gen/InstantCommand.yml

@@ -8,6 +8,7 @@ extra_includes:
 classes:
   InstantCommand:
     shared_ptr: true
+    subpackage: command
     methods:
       InstantCommand:
         overloads:

gen/InternalButton.yml

@@ -9,6 +9,7 @@ extra_includes:
 classes:
   InternalButton:
     shared_ptr: true
+    subpackage: button
     methods:
       InternalButton:
         overloads:

gen/JoystickButton.yml

@@ -9,6 +9,7 @@ extra_includes:
 classes:
   JoystickButton:
     shared_ptr: true
+    subpackage: button
     methods:
       JoystickButton:
         keepalive:

gen/NetworkButton.yml

@@ -9,6 +9,7 @@ extra_includes:
 classes:
   NetworkButton:
     shared_ptr: true
+    subpackage: button
     methods:
       NetworkButton:
         overloads:

gen/PIDAnalogAccelerometer.yml

@@ -2,6 +2,7 @@
 
 classes:
   PIDAnalogAccelerometer:
+    subpackage: command
     methods:
       PIDGet:
 

gen/PIDAnalogGyro.yml

@@ -2,6 +2,7 @@
 
 classes:
   PIDAnalogGyro:
+    subpackage: command
     methods:
       PIDGet:
 

gen/PIDAnalogInput.yml

@@ -2,6 +2,7 @@
 
 classes:
   PIDAnalogInput:
+    subpackage: command
     methods:
       PIDGet:
 

gen/PIDAnalogPotentiometer.yml

@@ -2,6 +2,7 @@
 
 classes:
   PIDAnalogPotentiometer:
+    subpackage: command
     methods:
       PIDGet:
 

gen/PIDBase.yml

@@ -6,6 +6,7 @@ extra_includes:
 classes:
   PIDBase:
     shared_ptr: true
+    subpackage: command
     ignored_bases:
     - wpi::SendableHelper<PIDBase>
     attributes:

gen/PIDCommand.yml

@@ -9,6 +9,7 @@ extra_includes:
 classes:
   PIDCommand:
     shared_ptr: true
+    subpackage: command
     methods:
       PIDCommand:
         overloads:

gen/PIDController.yml

@@ -4,6 +4,7 @@ classes:
   PIDController:
     ignored_bases:
     - Controller
+    subpackage: command
     methods:
       PIDController:
         overloads:

gen/PIDEncoder.yml

@@ -2,6 +2,7 @@
 
 classes:
   PIDEncoder:
+    subpackage: command
     methods:
       PIDGet:
 

gen/PIDInterface.yml

@@ -2,6 +2,7 @@
 
 classes:
   PIDInterface:
+    subpackage: command
     methods:
       PIDInterface:
       SetPID: