From 1cf19e53f3105e88a8651f5ecea8aa7826589def Mon Sep 17 00:00:00 2001 From: Hanspeter Schaub Date: Fri, 2 Aug 2024 13:57:59 -0600 Subject: [PATCH 1/2] remove depreciated code The bskSim simulations were still providing access to variables with 'Wrap' at the end of the variable in case other simulations where using this. Now only the new C module naming convention is used. --- examples/BskSim/models/BSK_FormationFsw.py | 178 -------------- examples/BskSim/models/BSK_Fsw.py | 208 ----------------- .../modelsMultiSat/BSK_MultiSatFsw.py | 133 ----------- .../modelsOpNav/BSK_OpNavFsw.py | 219 +----------------- 4 files changed, 5 insertions(+), 733 deletions(-) diff --git a/examples/BskSim/models/BSK_FormationFsw.py b/examples/BskSim/models/BSK_FormationFsw.py index 181dcd9fbe..ce7ec270ba 100644 --- a/examples/BskSim/models/BSK_FormationFsw.py +++ b/examples/BskSim/models/BSK_FormationFsw.py @@ -274,181 +274,3 @@ def zeroGateWayMsgs(self): self.attGuid2Msg.write(messaging.AttGuidMsgPayload()) self.cmdRwMotorMsg.write(messaging.ArrayMotorTorqueMsgPayload()) self.cmdRwMotor2Msg.write(messaging.ArrayMotorTorqueMsgPayload()) - - - @property - def inertial3DData(self): - return self.inertial3D - - inertial3DData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to inertial3DData as inertial3D", - inertial3DData) - - @property - def inertial3DWrap(self): - return self.inertial3D - - inertial3DWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to inertial3DWrap as inertial3D", - inertial3DWrap) - - - @property - def trackingErrorData(self): - return self.trackingError - - trackingErrorData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to trackingErrorData as trackingError", - trackingErrorData) - - @property - def trackingErrorWrap(self): - return self.trackingError - - trackingErrorWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to trackingErrorWrap as trackingError", - trackingErrorWrap) - - - @property - def mrpFeedbackRWsData(self): - return self.mrpFeedbackRWs - - mrpFeedbackRWsData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackRWsData as mrpFeedbackRWs", - mrpFeedbackRWsData) - - @property - def mrpFeedbackRWsWrap(self): - return self.mrpFeedbackRWs - - mrpFeedbackRWsWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackRWsWrap as mrpFeedbackRWs", - mrpFeedbackRWsWrap) - - - @property - def rwMotorTorqueData(self): - return self.rwMotorTorque - - rwMotorTorqueData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rwMotorTorqueData as rwMotorTorque", - rwMotorTorqueData) - - @property - def rwMotorTorqueWrap(self): - return self.rwMotorTorque - - rwMotorTorqueWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rwMotorTorqueWrap as rwMotorTorque", - rwMotorTorqueWrap) - - @property - def inertial3DData2(self): - return self.inertial3D2 - - inertial3DData2 = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to inertial3DData2 as inertial3D2", - inertial3DData2) - - @property - def inertial3DWrap2(self): - return self.inertial3D2 - - inertial3DWrap2 = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to inertial3DWrap2 as inertial3D2", - inertial3DWrap2) - - - @property - def trackingErrorData2(self): - return self.trackingError2 - - trackingErrorData2 = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to trackingErrorData2 as trackingError2", - trackingErrorData2) - - @property - def trackingErrorWrap2(self): - return self.trackingError2 - - trackingErrorWrap2 = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to trackingErrorWrap2 as trackingError2", - trackingErrorWrap2) - - - @property - def mrpFeedbackRWsData2(self): - return self.mrpFeedbackRWs2 - - mrpFeedbackRWsData2 = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackRWsData2 as mrpFeedbackRWs2", - mrpFeedbackRWsData2) - - @property - def mrpFeedbackRWsWrap2(self): - return self.mrpFeedbackRWs2 - - mrpFeedbackRWsWrap2 = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackRWsWrap2 as mrpFeedbackRWs2", - mrpFeedbackRWsWrap2) - - - @property - def rwMotorTorqueData2(self): - return self.rwMotorTorque2 - - rwMotorTorqueData2 = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rwMotorTorqueData2 as rwMotorTorque2", - rwMotorTorqueData2) - - @property - def rwMotorTorqueWrap2(self): - return self.rwMotorTorque2 - - rwMotorTorqueWrap2 = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rwMotorTorqueWrap2 as rwMotorTorque2", - rwMotorTorqueWrap2) - - @property - def mrpFeedbackControlData(self): - return self.mrpFeedbackControl - - mrpFeedbackControlData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackControlData as mrpFeedbackControl", - mrpFeedbackControlData) - - @property - def mrpFeedbackControlWrap(self): - return self.mrpFeedbackControl - - mrpFeedbackControlWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackControlWrap as mrpFeedbackControl", - mrpFeedbackControlWrap) - - @property - def spacecraftPointingWrap(self): - return self.spacecraftPointing - - spacecraftPointingWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to spacecraftPointingWrap as spacecraftPointing", - spacecraftPointingWrap) \ No newline at end of file diff --git a/examples/BskSim/models/BSK_Fsw.py b/examples/BskSim/models/BSK_Fsw.py index c184fec25b..4329e12463 100644 --- a/examples/BskSim/models/BSK_Fsw.py +++ b/examples/BskSim/models/BSK_Fsw.py @@ -362,211 +362,3 @@ def zeroGateWayMsgs(self): self.attRefMsg.write(messaging.AttRefMsgPayload()) self.attGuidMsg.write(messaging.AttGuidMsgPayload()) self.cmdRwMotorMsg.write(messaging.ArrayMotorTorqueMsgPayload()) - - @property - def inertial3DData(self): - return self.inertial3D - - inertial3DData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to inertial3DData as inertial3D", - inertial3DData) - - @property - def inertial3DWrap(self): - return self.inertial3D - - inertial3DWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to inertial3DWrap as inertial3D", - inertial3DWrap) - - - @property - def hillPointData(self): - return self.hillPoint - - hillPointData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to hillPointData as hillPoint", - hillPointData) - - @property - def hillPointWrap(self): - return self.hillPoint - - hillPointWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to hillPointWrap as hillPoint", - hillPointWrap) - - - @property - def sunSafePointData(self): - return self.sunSafePoint - - sunSafePointData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to sunSafePointData as sunSafePoint", - sunSafePointData) - - @property - def sunSafePointWrap(self): - return self.sunSafePoint - - sunSafePointWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to sunSafePointWrap as sunSafePoint", - sunSafePointWrap) - - - @property - def velocityPointData(self): - return self.velocityPoint - - velocityPointData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to velocityPointData as velocityPoint", - velocityPointData) - - @property - def velocityPointWrap(self): - return self.velocityPoint - - velocityPointWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to velocityPointWrap as velocityPoint", - velocityPointWrap) - - - @property - def cssWlsEstData(self): - return self.cssWlsEst - - cssWlsEstData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to cssWlsEstData as cssWlsEst", - cssWlsEstData) - - @property - def cssWlsEstWrap(self): - return self.cssWlsEst - - cssWlsEstWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to cssWlsEstWrap as cssWlsEst", - cssWlsEstWrap) - - - @property - def trackingErrorData(self): - return self.trackingError - - trackingErrorData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to trackingErrorData as trackingError", - trackingErrorData) - - @property - def trackingErrorWrap(self): - return self.trackingError - - trackingErrorWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to trackingErrorWrap as trackingError", - trackingErrorWrap) - - - @property - def mrpFeedbackControlData(self): - return self.mrpFeedbackControl - - mrpFeedbackControlData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackControlData as mrpFeedbackControl", - mrpFeedbackControlData) - - @property - def mrpFeedbackControlWrap(self): - return self.mrpFeedbackControl - - mrpFeedbackControlWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackControlWrap as mrpFeedbackControl", - mrpFeedbackControlWrap) - - - @property - def mrpFeedbackRWsData(self): - return self.mrpFeedbackRWs - - mrpFeedbackRWsData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackRWsData as mrpFeedbackRWs", - mrpFeedbackRWsData) - - @property - def mrpFeedbackRWsWrap(self): - return self.mrpFeedbackRWs - - mrpFeedbackRWsWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackRWsWrap as mrpFeedbackRWs", - mrpFeedbackRWsWrap) - - - @property - def mrpSteeringData(self): - return self.mrpSteering - - mrpSteeringData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpSteeringData as mrpSteering", - mrpSteeringData) - - @property - def mrpSteeringWrap(self): - return self.mrpSteering - - mrpSteeringWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpSteeringWrap as mrpSteering", - mrpSteeringWrap) - - - @property - def rateServoData(self): - return self.rateServo - - rateServoData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rateServoData as rateServo", - rateServoData) - - @property - def rateServoWrap(self): - return self.rateServo - - rateServoWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rateServoWrap as rateServo", - rateServoWrap) - - - @property - def rwMotorTorqueData(self): - return self.rwMotorTorque - - rwMotorTorqueData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rwMotorTorqueData as rwMotorTorque", - rwMotorTorqueData) - - @property - def rwMotorTorqueWrap(self): - return self.rwMotorTorque - - rwMotorTorqueWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rwMotorTorqueWrap as rwMotorTorque", - rwMotorTorqueWrap) diff --git a/examples/MultiSatBskSim/modelsMultiSat/BSK_MultiSatFsw.py b/examples/MultiSatBskSim/modelsMultiSat/BSK_MultiSatFsw.py index 6b030bf625..cc7a873111 100644 --- a/examples/MultiSatBskSim/modelsMultiSat/BSK_MultiSatFsw.py +++ b/examples/MultiSatBskSim/modelsMultiSat/BSK_MultiSatFsw.py @@ -295,136 +295,3 @@ def zeroGateWayMsgs(self): """Zero all the FSW gateway message payloads""" self.attRefMsg.write(messaging.AttRefMsgPayload()) self.attGuidMsg.write(messaging.AttGuidMsgPayload()) - - @property - def inertial3DPointData(self): - return self.inertial3DPoint - - inertial3DPointData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to inertial3DPointData as inertial3DPoint", - inertial3DPointData) - - @property - def inertial3DPointWrap(self): - return self.inertial3DPoint - - inertial3DPointWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to inertial3DPointWrap as inertial3DPoint", - inertial3DPointWrap) - - - @property - def sunPointData(self): - return self.sunPoint - - sunPointData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to sunPointData as sunPoint", - sunPointData) - - @property - def sunPointWrap(self): - return self.sunPoint - - sunPointWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to sunPointWrap as sunPoint", - sunPointWrap) - - - @property - def locPointData(self): - return self.locPoint - - locPointData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to locPointData as locPoint", - locPointData) - - @property - def locPointWrap(self): - return self.locPoint - - locPointWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to locPointWrap as locPoint", - locPointWrap) - - - @property - def spacecraftReconfigData(self): - return self.spacecraftReconfig - - spacecraftReconfigData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to spacecraftReconfigData as spacecraftReconfig", - spacecraftReconfigData) - - @property - def spacecraftReconfigWrap(self): - return self.spacecraftReconfig - - spacecraftReconfigWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to spacecraftReconfigWrap as spacecraftReconfig", - spacecraftReconfigWrap) - - - @property - def trackingErrorData(self): - return self.trackingError - - trackingErrorData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to trackingErrorData as trackingError", - trackingErrorData) - - @property - def trackingErrorWrap(self): - return self.trackingError - - trackingErrorWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to trackingErrorWrap as trackingError", - trackingErrorWrap) - - - @property - def mrpFeedbackRWsData(self): - return self.mrpFeedbackRWs - - mrpFeedbackRWsData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackRWsData as mrpFeedbackRWs", - mrpFeedbackRWsData) - - @property - def mrpFeedbackRWsWrap(self): - return self.mrpFeedbackRWs - - mrpFeedbackRWsWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackRWsWrap as mrpFeedbackRWs", - mrpFeedbackRWsWrap) - - - @property - def rwMotorTorqueData(self): - return self.rwMotorTorque - - rwMotorTorqueData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rwMotorTorqueData as rwMotorTorque", - rwMotorTorqueData) - - @property - def rwMotorTorqueWrap(self): - return self.rwMotorTorque - - rwMotorTorqueWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rwMotorTorqueWrap as rwMotorTorque", - rwMotorTorqueWrap) - \ No newline at end of file diff --git a/examples/OpNavScenarios/modelsOpNav/BSK_OpNavFsw.py b/examples/OpNavScenarios/modelsOpNav/BSK_OpNavFsw.py index 1efca1a266..ddbf1c6ffa 100644 --- a/examples/OpNavScenarios/modelsOpNav/BSK_OpNavFsw.py +++ b/examples/OpNavScenarios/modelsOpNav/BSK_OpNavFsw.py @@ -72,7 +72,7 @@ def __init__(self, SimBase, fswRate): # Define process name and default time-step for all FSW tasks defined later on self.processName = SimBase.FSWProcessName self.processTasksTimeStep = macros.sec2nano(fswRate) - + # Create module data and module wraps self.hillPoint = hillPoint.hillPoint() self.hillPoint.ModelTag = "hillPoint" @@ -85,7 +85,7 @@ def __init__(self, SimBase, fswRate): self.mrpFeedbackRWs = mrpFeedback.mrpFeedback() self.mrpFeedbackRWs.ModelTag = "mrpFeedbackRWs" - + self.rwMotorTorque = rwMotorTorque.rwMotorTorque() self.rwMotorTorque.ModelTag = "rwMotorTorque" @@ -122,7 +122,7 @@ def __init__(self, SimBase, fswRate): # Initialize all modules self.InitAllFSWObjects(SimBase) - + # Create tasks SimBase.fswProc.addTask(SimBase.CreateNewTask("opNavPointTask", self.processTasksTimeStep), 20) SimBase.fswProc.addTask(SimBase.CreateNewTask("headingPointTask", self.processTasksTimeStep), 20) @@ -398,14 +398,14 @@ def SetRWConfigMsg(self): rwElAngle = np.array([40.0, 40.0, 40.0, 40.0]) * macros.D2R rwAzimuthAngle = np.array([45.0, 135.0, 225.0, 315.0]) * macros.D2R wheelJs = 50.0 / (6000.0 * math.pi * 2.0 / 60) - + fswSetupRW.clearSetup() for elAngle, azAngle in zip(rwElAngle, rwAzimuthAngle): gsHat = (rbk.Mi(-azAngle, 3).dot(rbk.Mi(elAngle, 2))).dot(np.array([1, 0, 0])) fswSetupRW.create(gsHat, # spin axis wheelJs, # kg*m^2 0.2) # Nm uMax - + self.fswRwConfigMsg = fswSetupRW.writeConfigMessage() def SetRWMotorTorque(self, SimBase): @@ -591,212 +591,3 @@ def zeroGateWayMsgs(self): self.opnavSecondaryMsg.write(messaging.OpNavMsgPayload()) self.opnavCirclesMsg.write(messaging.OpNavCirclesMsgPayload()) - - @property - def hillPointData(self): - return self.hillPoint - - hillPointData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to hillPointData as hillPoint", - hillPointData) - - @property - def hillPointWrap(self): - return self.hillPoint - - hillPointWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to hillPointWrap as hillPoint", - hillPointWrap) - - - @property - def opNavPointData(self): - return self.opNavPoint - - opNavPointData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to opNavPointData as opNavPoint", - opNavPointData) - - @property - def opNavPointWrap(self): - return self.opNavPoint - - opNavPointWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to opNavPointWrap as opNavPoint", - opNavPointWrap) - - - @property - def trackingErrorCamData(self): - return self.trackingErrorCam - - trackingErrorCamData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to trackingErrorCamData as trackingErrorCam", - trackingErrorCamData) - - @property - def trackingErrorCamWrap(self): - return self.trackingErrorCam - - trackingErrorCamWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to trackingErrorCamWrap as trackingErrorCam", - trackingErrorCamWrap) - - - @property - def mrpFeedbackRWsData(self): - return self.mrpFeedbackRWs - - mrpFeedbackRWsData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackRWsData as mrpFeedbackRWs", - mrpFeedbackRWsData) - - @property - def mrpFeedbackRWsWrap(self): - return self.mrpFeedbackRWs - - mrpFeedbackRWsWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to mrpFeedbackRWsWrap as mrpFeedbackRWs", - mrpFeedbackRWsWrap) - - - @property - def rwMotorTorqueData(self): - return self.rwMotorTorque - - rwMotorTorqueData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rwMotorTorqueData as rwMotorTorque", - rwMotorTorqueData) - - @property - def rwMotorTorqueWrap(self): - return self.rwMotorTorque - - rwMotorTorqueWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to rwMotorTorqueWrap as rwMotorTorque", - rwMotorTorqueWrap) - - - @property - def pixelLineData(self): - return self.pixelLine - - pixelLineData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to pixelLineData as pixelLine", - pixelLineData) - - @property - def pixelLineWrap(self): - return self.pixelLine - - pixelLineWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to pixelLineWrap as pixelLine", - pixelLineWrap) - - - @property - def opNavFaultData(self): - return self.opNavFault - - opNavFaultData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to opNavFaultData as opNavFault", - opNavFaultData) - - @property - def opNavFaultWrap(self): - return self.opNavFault - - opNavFaultWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to opNavFaultWrap as opNavFault", - opNavFaultWrap) - - - @property - def horizonNavData(self): - return self.horizonNav - - horizonNavData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to horizonNavData as horizonNav", - horizonNavData) - - @property - def horizonNavWrap(self): - return self.horizonNav - - horizonNavWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to horizonNavWrap as horizonNav", - horizonNavWrap) - - - @property - def relativeODData(self): - return self.relativeOD - - relativeODData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to relativeODData as relativeOD", - relativeODData) - - @property - def relativeODWrap(self): - return self.relativeOD - - relativeODWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to relativeODWrap as relativeOD", - relativeODWrap) - - - @property - def pixelLineFilterData(self): - return self.pixelLineFilter - - pixelLineFilterData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to pixelLineFilterData as pixelLineFilter", - pixelLineFilterData) - - @property - def pixelLineFilterWrap(self): - return self.pixelLineFilter - - pixelLineFilterWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to pixelLineFilterWrap as pixelLineFilter", - pixelLineFilterWrap) - - - @property - def headingUKFData(self): - return self.headingUKF - - headingUKFData = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to headingUKFData as headingUKF", - headingUKFData) - - @property - def headingUKFWrap(self): - return self.headingUKF - - headingUKFWrap = deprecated.DeprecatedProperty( - "2024/07/30", - "Due to the new C module syntax, refer to headingUKFWrap as headingUKF", - headingUKFWrap) -# BSKFswModels() From fd87a3f1ede8038fbe9b51fe3aad8bb07c3af663 Mon Sep 17 00:00:00 2001 From: Hanspeter Schaub Date: Fri, 2 Aug 2024 14:02:29 -0600 Subject: [PATCH 2/2] update sphinx requirements The style file `sphinx_rtd_theme` we use is not yet compatible with sphinx 8.x. --- docs/source/Install/installOptionalPackages.rst | 2 +- requirements_optional.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/Install/installOptionalPackages.rst b/docs/source/Install/installOptionalPackages.rst index 0318907211..86182012a4 100644 --- a/docs/source/Install/installOptionalPackages.rst +++ b/docs/source/Install/installOptionalPackages.rst @@ -28,7 +28,7 @@ Creating the Sphinx Basilisk Documentation Go to :ref:`createHtmlDocumentation` to learn what associated python tools are required. The following python packages must be installed via ``pip``:: - pip3 install 'sphinx>7.0.0' sphinx_rtd_theme==2.0.0 breathe recommonmark docutils + pip3 install 'sphinx>7.0.0, <8.0.0' sphinx_rtd_theme==2.0.0 breathe recommonmark docutils See the list at the top of this page for what versions of these packages are acceptable. diff --git a/requirements_optional.txt b/requirements_optional.txt index d2584b48bd..a9f9371a53 100644 --- a/requirements_optional.txt +++ b/requirements_optional.txt @@ -1,7 +1,7 @@ breathe docutils recommonmark -sphinx>7.0.0 +sphinx>7.0.0, <8.0.0 sphinx_rtd_theme==2.0.0 pre-commit clang-format