Merge remote-tracking branch 'origin/develop' into tst/organize-test-files

MateusStano · MateusStano · commit d6c664c20ebc · 2025-10-23T22:01:55.000-03:00
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9"]
+        python-version: ["3.10"]
     steps:
     - uses: actions/checkout@main
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@main
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/test-pytest-slow.yaml b/.github/workflows/test-pytest-slow.yaml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, 3.13]
+        python-version: [3.10, 3.14]
     env:
       PYTHON: ${{ matrix.python-version }}
       MPLBACKEND: Agg
diff --git a/.github/workflows/test_pytest.yaml b/.github/workflows/test_pytest.yaml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.9, 3.13]
+        python-version: ["3.10", "3.14"]
     env:
       OS: ${{ matrix.os }}
       PYTHON: ${{ matrix.python-version }}
diff --git a/.pylintrc b/.pylintrc
@@ -88,7 +88,7 @@ persistent=yes
 
 # Minimum Python version to use for version dependent checks. Will default to
 # the version used to run pylint.
-py-version=3.9
+py-version=3.10
 
 # Discover python modules and packages in the file system subtree.
 recursive=no
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,18 +31,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 Attention: The newest changes should be on top -->
 
 ### Added
+
 - ENH: Tank Fluids with Variable Density from Temperature and Pressure [#852](https://github.com/RocketPy-Team/RocketPy/pull/852)
 - ENH: Controller (AirBrakes) and Sensors Encoding [#849](https://github.com/RocketPy-Team/RocketPy/pull/849)
-- EHN: Addition of ensemble variable to ECMWF dictionaries [#842](https://github.com/RocketPy-Team/RocketPy/pull/842) 
+- EHN: Addition of ensemble variable to ECMWF dictionaries [#842](https://github.com/RocketPy-Team/RocketPy/pull/842)
 - ENH: Added Crop and Clip Methods to Function Class [#817](https://github.com/RocketPy-Team/RocketPy/pull/817)
 - DOC: Add Flight class usage documentation and update index [#841](https://github.com/RocketPy-Team/RocketPy/pull/841)
 - ENH: Discretized and No-Pickle Encoding Options [#827](https://github.com/RocketPy-Team/RocketPy/pull/827)
 - ENH: Add the Coriolis Force to the Flight class [#799](https://github.com/RocketPy-Team/RocketPy/pull/799)
 - ENH: Improve parachute geometric parametrization [#835](https://github.com/RocketPy-Team/RocketPy/pull/835)
+- ENH: Changing ellipses plot axis label [#855](https://github.com/RocketPy-Team/RocketPy/pull/855)
 
 ### Changed
 
+- MNT: bumps min python version to 3.10 [#857](https://github.com/RocketPy-Team/RocketPy/pull/857)
 - DOC: Update docs dependencies and sub dependencies [#851](https://github.com/RocketPy-Team/RocketPy/pull/851)
+- MNT: extract flight data exporters [#845](https://github.com/RocketPy-Team/RocketPy/pull/845)
 - ENH: _MotorPrints inheritance - issue #460 [#828](https://github.com/RocketPy-Team/RocketPy/pull/828)
 - MNT: fix deprecations and warnings [#829](https://github.com/RocketPy-Team/RocketPy/pull/829)
 
diff --git a/docs/user/first_simulation.rst b/docs/user/first_simulation.rst
@@ -565,19 +565,27 @@ Visualizing the Trajectory in Google Earth
 
 We can export the trajectory to ``.kml`` to visualize it in Google Earth:
 
+Use the dedicated exporter class:
+
 .. jupyter-input::
 
-    test_flight.export_kml(
+    from rocketpy.simulation import FlightDataExporter
+
+    FlightDataExporter(test_flight).export_kml(
         file_name="trajectory.kml",
         extrude=True,
-        altitude_mode="relative_to_ground",
+        altitude_mode="relativetoground",
     )
 
 .. note::
 
     To learn more about the ``.kml`` format, see
     `KML Reference <https://developers.google.com/kml/documentation/kmlreference>`_.
 
+.. note::
+
+    The legacy method ``Flight.export_kml`` is deprecated. Use
+    :meth:`rocketpy.simulation.flight_data_exporter.FlightDataExporter.export_kml`.
 
 Manipulating results
 --------------------
@@ -610,29 +618,41 @@ In this section, we will explore how to export specific data from your RocketPy
 simulations to CSV files. This is particularly useful if you want to insert the
 data into spreadsheets or other software for further analysis.
 
-The main method that is used to export data is the :meth:`rocketpy.Flight.export_data` method. This method exports selected flight attributes to a CSV file. In this first example, we will export the rocket angle of attack (see :meth:`rocketpy.Flight.angle_of_attack`) and the rocket mach number (see :meth:`rocketpy.Flight.mach_number`) to the file ``calisto_flight_data.csv``.
+The recommended API is
+:meth:`rocketpy.simulation.flight_data_exporter.FlightDataExporter.export_data`,
+which exports selected flight attributes to a CSV file. In this first example,
+we export the rocket angle of attack (see :meth:`rocketpy.Flight.angle_of_attack`)
+and the rocket Mach number (see :meth:`rocketpy.Flight.mach_number`) to the file
+``calisto_flight_data.csv``.
 
 .. jupyter-execute::
 
-    test_flight.export_data(
+    from rocketpy.simulation import FlightDataExporter
+
+    exporter = FlightDataExporter(test_flight)
+    exporter.export_data(
         "calisto_flight_data.csv",
         "angle_of_attack",
         "mach_number",
     )
 
-| As you can see, the first argument of the method is the name of the file to be created. The following arguments are the attributes to be exported. We can check the file that was created by reading it with the :func:`pandas.read_csv` function:
+| As you can see, the first argument is the file name to be created. The following
+arguments are the attributes to be exported. We can check the file by reading it
+with :func:`pandas.read_csv`:
 
 .. jupyter-execute::
 
     import pandas as pd
 
     pd.read_csv("calisto_flight_data.csv")
 
-| The file header specifies the meaning of each column. The time samples are obtained from the simulation solver steps. Should you want to export the data at a different sampling rate, you can use the ``time_step`` argument of the :meth:`rocketpy.Flight.export_data` method as follows.
+| The file header specifies the meaning of each column. The time samples are
+obtained from the simulation solver steps. To export the data at a different
+sampling rate, use the ``time_step`` argument:
 
 .. jupyter-execute::
 
-    test_flight.export_data(
+    exporter.export_data(
         "calisto_flight_data.csv",
         "angle_of_attack",
         "mach_number",
@@ -641,15 +661,16 @@ The main method that is used to export data is the :meth:`rocketpy.Flight.export
 
     pd.read_csv("calisto_flight_data.csv")
 
-This will export the same data at a sampling rate of 1 second. The flight data will be interpolated to match the new sampling rate.
+This exports the same data at a sampling rate of 1 second. The flight data is
+interpolated to match the new sampling rate.
 
-Finally, the :meth:`rocketpy.Flight.export_data` method also provides a convenient way to export the entire flight solution (see :meth:`rocketpy.Flight.solution_array`) to a CSV file. This is done by not passing any attributes names to the method.
+Finally, ``FlightDataExporter.export_data`` also provides a convenient way to
+export the entire flight solution (see :meth:`rocketpy.Flight.solution_array`)
+by not passing any attribute names:
 
 .. jupyter-execute::
 
-    test_flight.export_data(
-        "calisto_flight_data.csv",
-    )
+    exporter.export_data("calisto_flight_data.csv")
 
 .. jupyter-execute::
     :hide-code:
@@ -659,6 +680,10 @@ Finally, the :meth:`rocketpy.Flight.export_data` method also provides a convenie
     import os
     os.remove("calisto_flight_data.csv")
 
+.. note::
+
+    The legacy method ``Flight.export_data`` is deprecated. Use
+    :meth:`rocketpy.simulation.flight_data_exporter.FlightDataExporter.export_data`.
 
 Saving and Storing Plots
 ------------------------
@@ -670,7 +695,7 @@ For instance, we can save our rocket drawing as a ``.png`` file:
 
     calisto.draw(filename="calisto_drawing.png")
 
-Also, if you want to save a specific rocketpy plot, every RocketPy 
+Also, if you want to save a specific rocketpy plot, every RocketPy
 attribute of type :class:`rocketpy.Function` is capable of saving its plot
 as an image file. For example, we can save our rocket's speed plot and the
 trajectory plot as ``.jpg`` files:
diff --git a/docs/user/installation.rst b/docs/user/installation.rst
@@ -85,7 +85,7 @@ Requirements
 Python Version
 ^^^^^^^^^^^^^^
 
-RocketPy supports Python 3.9 and above.
+RocketPy supports Python 3.10 and above.
 Sorry, there are currently no plans to support earlier versions.
 If you really need to run RocketPy on Python 3.8 or earlier, feel free to submit an issue and we will see what we can do!
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ version = "1.10.0"
 description="Advanced 6-DOF trajectory simulation for High-Power Rocketry."
 dynamic = ["dependencies"]
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 authors = [
   {name = "Giovani Hidalgo Ceotto", email = "ghceotto@gmail.com"},
   {name = "Guilherme Fernandes Alves", email = "guilherme_fernandes@usp.br"},
diff --git a/rocketpy/mathutils/function.py b/rocketpy/mathutils/function.py
@@ -449,6 +449,9 @@ def rbf_interpolation(x, x_min, x_max, x_data, y_data, coeffs):  # pylint: disab
 
             self._interpolation_func = rbf_interpolation
 
+        else:
+            raise ValueError(f"Interpolation {interpolation} method not recognized.")
+
     def __set_extrapolation_func(self):  # pylint: disable=too-many-statements
         """Defines extrapolation function used by the Function. Each
         extrapolation method has its own function. The function is stored in
@@ -532,6 +535,11 @@ def natural_extrapolation(x, x_min, x_max, x_data, y_data, _):
                 def natural_extrapolation(x, x_min, x_max, x_data, y_data, coeffs):  # pylint: disable=unused-argument
                     return interpolator(x)
 
+            else:
+                raise ValueError(
+                    f"Natural extrapolation not defined for {interpolation}."
+                )
+
             self._extrapolation_func = natural_extrapolation
         elif extrapolation == 2:  # constant
             if self.__dom_dim__ == 1:
@@ -547,6 +555,8 @@ def constant_extrapolation(x, x_min, x_max, x_data, y_data, coeffs):
                     return extrapolator(x)
 
             self._extrapolation_func = constant_extrapolation
+        else:
+            raise ValueError(f"Extrapolation {extrapolation} method not recognized.")
 
     def set_get_value_opt(self):
         """Defines a method that evaluates interpolations.
diff --git a/rocketpy/plots/monte_carlo_plots.py b/rocketpy/plots/monte_carlo_plots.py
@@ -1,4 +1,5 @@
 import matplotlib.pyplot as plt
+from matplotlib.transforms import offset_copy
 import numpy as np
 
 from ..tools import generate_monte_carlo_ellipses, import_optional_dependency
@@ -114,9 +115,20 @@ def ellipses(
             )
 
         plt.legend()
+
         ax.set_title("1$\\sigma$, 2$\\sigma$ and 3$\\sigma$ Monte Carlo Ellipses")
-        ax.set_ylabel("North (m)")
-        ax.set_xlabel("East (m)")
+        north_south_offset = offset_copy(
+            ax.transAxes, fig=plt.gcf(), x=-72, y=0, units="points"
+        )
+        east_west_offset = offset_copy(
+            ax.transAxes, fig=plt.gcf(), x=0, y=-30, units="points"
+        )
+        ax.text(0, 0, "West", va="bottom", ha="center", transform=east_west_offset)
+        ax.text(1, 0, "East", va="bottom", ha="center", transform=east_west_offset)
+        ax.text(0, 0, "South", va="bottom", ha="left", transform=north_south_offset)
+        ax.text(0, 1, "North", va="top", ha="left", transform=north_south_offset)
+        ax.set_ylabel("Y (m)")
+        ax.set_xlabel("X (m)")
 
         # Add background image to plot
         # TODO: In the future, integrate with other libraries to plot the map (e.g. cartopy, ee, etc.)
diff --git a/rocketpy/simulation/__init__.py b/rocketpy/simulation/__init__.py
@@ -1,4 +1,5 @@
 from .flight import Flight
+from .flight_data_exporter import FlightDataExporter
 from .flight_data_importer import FlightDataImporter
 from .monte_carlo import MonteCarlo
 from .multivariate_rejection_sampler import MultivariateRejectionSampler
diff --git a/rocketpy/simulation/flight.py b/rocketpy/simulation/flight.py
diff --git a/rocketpy/simulation/flight_data_exporter.py b/rocketpy/simulation/flight_data_exporter.py
diff --git a/rocketpy/tools.py b/rocketpy/tools.py
diff --git a/tests/integration/simulation/test_flight.py b/tests/integration/simulation/test_flight.py
diff --git a/tests/unit/test_flight_data_exporter.py b/tests/unit/test_flight_data_exporter.py
diff --git a/tests/unit/test_flight_export_deprecation.py b/tests/unit/test_flight_export_deprecation.py
