diff --git a/photon-lib/py/photonlibpy/photonCamera.py b/photon-lib/py/photonlibpy/photonCamera.py index c3ac1ddcae..c7635dca58 100644 --- a/photon-lib/py/photonlibpy/photonCamera.py +++ b/photon-lib/py/photonlibpy/photonCamera.py @@ -19,11 +19,11 @@ from typing import List import ntcore -import wpilib -from wpilib import RobotController, Timer # magical import to make serde stuff work import photonlibpy.generated # noqa +import wpilib +from wpilib import RobotController, Timer from .packet import Packet from .targeting.photonPipelineResult import PhotonPipelineResult diff --git a/photon-lib/py/test/photonPoseEstimator_test.py b/photon-lib/py/test/photonPoseEstimator_test.py index 8988f04a8e..5f9787e43a 100644 --- a/photon-lib/py/test/photonPoseEstimator_test.py +++ b/photon-lib/py/test/photonPoseEstimator_test.py @@ -15,9 +15,6 @@ ## along with this program. If not, see . ############################################################################### -from robotpy_apriltag import AprilTag, AprilTagFieldLayout -from wpimath.geometry import Pose3d, Rotation3d, Transform3d, Translation3d - from photonlibpy import PhotonPoseEstimator, PoseStrategy from photonlibpy.targeting import ( PhotonPipelineMetadata, @@ -26,6 +23,8 @@ ) from photonlibpy.targeting.multiTargetPNPResult import MultiTargetPNPResult, PnpResult from photonlibpy.targeting.photonPipelineResult import PhotonPipelineResult +from robotpy_apriltag import AprilTag, AprilTagFieldLayout +from wpimath.geometry import Pose3d, Rotation3d, Transform3d, Translation3d class PhotonCameraInjector: diff --git a/photon-lib/py/test/photonlibpy_test.py b/photon-lib/py/test/photonlibpy_test.py index 2610358fa8..8835c99773 100644 --- a/photon-lib/py/test/photonlibpy_test.py +++ b/photon-lib/py/test/photonlibpy_test.py @@ -18,7 +18,6 @@ from time import sleep import ntcore - from photonlibpy import PhotonCamera from photonlibpy.photonCamera import setVersionCheckEnabled diff --git a/photon-lib/py/test/visionSystemSim_test.py b/photon-lib/py/test/visionSystemSim_test.py index 0648e39576..4851f81909 100644 --- a/photon-lib/py/test/visionSystemSim_test.py +++ b/photon-lib/py/test/visionSystemSim_test.py @@ -2,6 +2,9 @@ import ntcore as nt import pytest +from photonlibpy.estimation import TargetModel, VisionEstimation +from photonlibpy.photonCamera import PhotonCamera, setVersionCheckEnabled +from photonlibpy.simulation import PhotonCameraSim, VisionSystemSim, VisionTargetSim from robotpy_apriltag import AprilTag, AprilTagFieldLayout from wpimath.geometry import ( Pose2d, @@ -14,10 +17,6 @@ ) from wpimath.units import feetToMeters, meters -from photonlibpy.estimation import TargetModel, VisionEstimation -from photonlibpy.photonCamera import PhotonCamera, setVersionCheckEnabled -from photonlibpy.simulation import PhotonCameraSim, VisionSystemSim, VisionTargetSim - @pytest.fixture(autouse=True) def setupCommon() -> None: