MNT: adjusting minor changes to .rpy functions and tests.

Formatted docstrings correctly.
Reverted duplication of `test_encoding.py` files.
Version warning will be called when loaded version is more recent.

Author: ArthurJWH

rocketpy/utilities.py

@@ -692,8 +692,9 @@ def get_instance_attributes(instance):
     return attributes_dict
 
 
-def save_to_rpy(flight: Flight, filename: str, include_output = False):
-    """Saves a .rpy file into the given path, containing key simulation informations to reproduce the results.
+def save_to_rpy(flight: Flight, filename: str, include_outputs = False):
+    """Saves a .rpy file into the given path, containing key simulation 
+    informations to reproduce the results.
 
     Parameters
     ----------
@@ -702,7 +703,8 @@ def save_to_rpy(flight: Flight, filename: str, include_output = False):
     filename : str
         Path where the file will be saved in
     include_output : bool, optional
-        If True, the function will include extra outputs into the file, by default False
+        If True, the function will include extra outputs into the file,
+        by default False
         
     Returns
     -------
@@ -720,7 +722,7 @@ def save_to_rpy(flight: Flight, filename: str, include_output = False):
             f,
             cls=RocketPyEncoder,
             indent=2,
-            include_outputs=include_output,
+            include_outputs=include_outputs,
         )
 
 
@@ -732,7 +734,8 @@ def load_from_rpy(filename: str, resimulate = False):
     filename : str
         Path where the file to be loaded is
     resimulate : bool, optional
-        If True, the function will resimulate the object Flight, by default False
+        If True, the function will resimulate the object Flight,
+        by default False
         
     Returns
     -------
@@ -743,10 +746,15 @@ def load_from_rpy(filename: str, resimulate = False):
     if ext == ".rpy":
         with open(filename, "r") as f:
             data = json.load(f)
-            if data["version"] < version("rocketpy"):
-                warnings.warn("The file was saved in an older version of RocketPy than the one in the current environment")
+            if data["version"] > version("rocketpy"):
+                warnings.warn("The file was saved in an updated version of",
+                              f"RocketPy (v{data["version"]}), the current",
+                              f"imported module is v{version('rocketpy')}")
             simulation = json.dumps(data["simulation"])
-            flight = json.loads(simulation, cls=RocketPyDecoder, resimulate=resimulate)
+            flight = json.loads(
+                simulation,
+                cls=RocketPyDecoder,
+                resimulate=resimulate)
         return flight
     else:
         raise ValueError(f"Invalid file extension: {ext}. Allowed: .rpy")

…tion/test_flight_save_load_resimulate.py tests/integration/test_encodingtests/integration/test_flight_save_load_resimulate.py renamed to tests/integration/test_encoding tests/integration/test_flight_save_load_resimulate.py renamed to tests/integration/test_encoding

@@ -7,6 +7,50 @@
 from rocketpy._encoders import RocketPyDecoder, RocketPyEncoder
 
 
+@pytest.mark.parametrize(
+    ["flight_name", "include_outputs"],
+    [
+        ("flight_calisto", False),
+        ("flight_calisto", True),
+        ("flight_calisto_robust", True),
+        ("flight_calisto_liquid_modded", False),
+        ("flight_calisto_hybrid_modded", False),
+    ],
+)
+def test_flight_save_load_no_resimulate(flight_name, include_outputs, request):
+    """Test encoding a ``rocketpy.Flight``.
+
+    Parameters
+    ----------
+    flight_name : str
+        Name flight fixture to encode.
+    request : pytest.FixtureRequest
+        Pytest request object.
+    """
+    flight_to_save = request.getfixturevalue(flight_name)
+
+    with open("flight.json", "w") as f:
+        json.dump(
+            flight_to_save,
+            f,
+            cls=RocketPyEncoder,
+            indent=2,
+            include_outputs=include_outputs,
+        )
+
+    with open("flight.json", "r") as f:
+        flight_loaded = json.load(f, cls=RocketPyDecoder, resimulate=False)
+
+    assert np.isclose(flight_to_save.t_initial, flight_loaded.t_initial)
+    assert np.isclose(flight_to_save.out_of_rail_time, flight_loaded.out_of_rail_time)
+    assert np.isclose(flight_to_save.apogee_time, flight_loaded.apogee_time)
+
+    # Higher tolerance due to random parachute trigger
+    assert np.isclose(flight_to_save.t_final, flight_loaded.t_final, rtol=1e-3)
+
+    os.remove("flight.json")
+
+
 @pytest.mark.slow
 @pytest.mark.parametrize(
     ["flight_name", "include_outputs"],
@@ -18,7 +62,7 @@
         ("flight_calisto_hybrid_modded", False),
     ],
 )
-def test_flight_save_load(flight_name, include_outputs, request):
+def test_flight_save_load_resimulate(flight_name, include_outputs, request):
     """Test encoding a ``rocketpy.Flight``.
 
     Parameters
@@ -69,7 +113,7 @@ def test_function_encoder(function_name, request):
 
     json_encoded = json.dumps(function_to_encode, cls=RocketPyEncoder)
 
-    function_loaded = json.loads(json_encoded, cls=RocketPyDecoder, resimulate=True)
+    function_loaded = json.loads(json_encoded, cls=RocketPyDecoder)
 
     assert isinstance(function_loaded, type(function_to_encode))
     assert np.isclose(function_to_encode(0), function_loaded(0))
@@ -92,7 +136,7 @@ def test_environment_encoder(environment_name, request):
 
     json_encoded = json.dumps(env_to_encode, cls=RocketPyEncoder)
 
-    env_loaded = json.loads(json_encoded, cls=RocketPyDecoder, resimulate=True)
+    env_loaded = json.loads(json_encoded, cls=RocketPyDecoder)
 
     test_heights = np.linspace(0, 10000, 100)
 
@@ -136,7 +180,7 @@ def test_motor_encoder(motor_name, request):
 
     json_encoded = json.dumps(motor_to_encode, cls=RocketPyEncoder)
 
-    motor_loaded = json.loads(json_encoded, cls=RocketPyDecoder, resimulate=True)
+    motor_loaded = json.loads(json_encoded, cls=RocketPyDecoder)
 
     sample_times = np.linspace(*motor_to_encode.burn_time, 100)
 
@@ -172,7 +216,7 @@ def test_rocket_encoder(rocket_name, request):
 
     json_encoded = json.dumps(rocket_to_encode, cls=RocketPyEncoder)
 
-    rocket_loaded = json.loads(json_encoded, cls=RocketPyDecoder, resimulate=True)
+    rocket_loaded = json.loads(json_encoded, cls=RocketPyDecoder)
 
     sample_times = np.linspace(*rocket_to_encode.motor.burn_time, 100)
 

tests/integration/test_flight_save_load_no_resimulate

@@ -213,7 +213,8 @@ def test_check_constant(f, eps, expected):
 
 
 def test_save_to_rpy(flight_calisto_robust):
-    """Tests if the save_to_rpy function correctly saves the data to the correct file.
+    """Tests if the save_to_rpy function correctly saves the data to the 
+    correct file.
 
     Parameters
     ----------
@@ -222,13 +223,15 @@ def test_save_to_rpy(flight_calisto_robust):
         in the conftest.py file.
     """
     utilities.save_to_rpy(flight_calisto_robust, "flight_calisto_robust.rpy")
-    assert os.path.splitext(os.path.basename("flight_calisto_robust.rpy")) == ("flight_calisto_robust", ".rpy")
+    assert (os.path.splitext(os.path.basename("flight_calisto_robust.rpy"))
+            == ("flight_calisto_robust", ".rpy"))
     assert os.path.getsize("flight_calisto_robust.rpy") > 0
     os.remove("flight_calisto_robust.rpy")
 
 @patch("matplotlib.pyplot.show")
 def test_load_from_rpy(mock_show):  # pylint: disable=unused-argument
-    """Tests if the load_from_rpy function correctly loads the data into a flight object.
+    """Tests if the load_from_rpy function correctly loads the data into a 
+    flight object.
 
     Parameters
     ----------