Skip to content

Commit f4c87f0

Browse files
committed
[MINOR] Get rid of explicit SPICE unloading
1 parent 1f7e891 commit f4c87f0

File tree

3 files changed

+6
-25
lines changed

3 files changed

+6
-25
lines changed

src/bsk_rl/sim/world.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,6 @@ def setup_ephem_object(self, priority: int = 988, **kwargs) -> None:
203203
self.world_task_name, self.ephemConverter, ModelPriority=priority
204204
)
205205

206-
def __del__(self) -> None:
207-
"""Log when world is deleted and unload SPICE."""
208-
super().__del__()
209-
try:
210-
self.gravFactory.unloadSpiceKernels()
211-
except AttributeError:
212-
pass
213-
214206

215207
class EclipseWorldModel(WorldModel):
216208
def __init__(self, *args, **kwargs) -> None:

src/bsk_rl/utils/orbital.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -551,13 +551,6 @@ def r_BP_P(self) -> interp1d:
551551
fill_value="extrapolate",
552552
)
553553

554-
def __del__(self) -> None:
555-
"""Unload spice kernels when object is deleted."""
556-
try:
557-
self.gravFactory.unloadSpiceKernels()
558-
except AttributeError:
559-
pass
560-
561554

562555
def lla2ecef(lat: float, long: float, radius: float):
563556
"""Project LLA to Earth Centered, Earth Fixed location.

tests/unittest/sim/test_world.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,13 @@ def test_omega_PN_N(self):
7474
@patch(baseworld + "setup_gravity_bodies")
7575
@patch(baseworld + "setup_ephem_object")
7676
def test_setup_and_delete(self, grav_set, epoch_set):
77-
world = WorldModel(MagicMock(), 1.0)
77+
world = WorldModel(MagicMock(), 1.0) # noqa: F841
7878
for setter in (grav_set, epoch_set):
7979
setter.assert_called_once()
80-
unload_function = MagicMock()
81-
world.gravFactory = MagicMock(unloadSpiceKernels=unload_function)
82-
del world
83-
unload_function.assert_called_once()
8480

8581
@patch(baseworld + "_setup_world_objects", MagicMock())
8682
@patch(module + "simIncludeGravBody", MagicMock())
87-
def testsetup_gravity_bodies(self):
83+
def test_setup_gravity_bodies(self):
8884
# Smoke test
8985
world = WorldModel(MagicMock(), 1.0)
9086
world.simulator = MagicMock()
@@ -93,7 +89,7 @@ def testsetup_gravity_bodies(self):
9389

9490
@patch(baseworld + "_setup_world_objects", MagicMock())
9591
@patch(module + "ephemerisConverter", MagicMock())
96-
def testsetup_epoch_object(self):
92+
def test_setup_epoch_object(self):
9793
# Smoke test
9894
world = WorldModel(MagicMock(), 1.0)
9995
world.simulator = MagicMock()
@@ -109,7 +105,7 @@ class TestAtmosphereWorldModel:
109105

110106
@patch(baseworld + "_setup_world_objects", MagicMock())
111107
@patch(module + "exponentialAtmosphere", MagicMock())
112-
def testsetup_atmosphere_density_model(self):
108+
def test_setup_atmosphere_density_model(self):
113109
# Smoke test
114110
world = AtmosphereWorldModel(MagicMock(), 1.0)
115111
world.simulator = MagicMock()
@@ -129,7 +125,7 @@ class TestEclipseWorldModel:
129125

130126
@patch(baseworld + "_setup_world_objects", MagicMock())
131127
@patch(module + "eclipse", MagicMock())
132-
def testsetup_eclipse_object(self):
128+
def test_setup_eclipse_object(self):
133129
# Smoke test
134130
world = EclipseWorldModel(MagicMock(), 1.0)
135131
world.simulator = MagicMock()
@@ -151,7 +147,7 @@ def test_setup_world_objects(self, ground_set):
151147

152148
@patch(groundworld + "_setup_world_objects", MagicMock())
153149
@patch(groundworld + "_create_ground_station")
154-
def testsetup_ground_locations(self, mock_gs_create):
150+
def test_setup_ground_locations(self, mock_gs_create):
155151
world = GroundStationWorldModel(MagicMock(), 1.0)
156152
world.setup_ground_locations([dict(a=1), dict(b=2)], 1000.0, 1.0, 1000.0)
157153
mock_gs_create.assert_has_calls(

0 commit comments

Comments
 (0)