adjust pre-commit to enable ruff's isort functionality

nalquas · nalquas · commit 4acd8e1bc3bd · 2026-03-19T18:49:49.000+01:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,8 +17,8 @@ repos:
   - id: remove-crlf
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.15.2
+  rev: v0.15.7
   hooks:
   - id: ruff
-    args: [ --fix ]
+    args: [ --select, I, --fix ]
   - id: ruff-format
diff --git a/bears_flight_simulation/__main__.py b/bears_flight_simulation/__main__.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 
-import click
 import logging
 import os
 from pathlib import Path
 
+import click
+
 from bears_flight_simulation.simulation import load_configs_and_run_simulation
 from bears_flight_simulation.simulation_gui import start_and_hand_over_to_simulation_gui
 
diff --git a/bears_flight_simulation/common/common_paths.py b/bears_flight_simulation/common/common_paths.py
@@ -1,7 +1,8 @@
-import platformdirs
-from pathlib import Path
 import os
 import sys
+from pathlib import Path
+
+import platformdirs
 
 USER_BASE_FOLDER = Path(platformdirs.user_config_dir()) / "bears-flight-simulation"
 USER_SIMULATION_CONFIG_BASE_FOLDER = USER_BASE_FOLDER / "simulations"
diff --git a/bears_flight_simulation/core/airbrake_library.py b/bears_flight_simulation/core/airbrake_library.py
@@ -1,7 +1,6 @@
-from bears_flight_simulation.parsers.airbrake_config import AirbrakeConfig
-
 from bears_flight_simulation.core.library import Library
 from bears_flight_simulation.core.library_entry import LibraryEntry
+from bears_flight_simulation.parsers.airbrake_config import AirbrakeConfig
 
 
 class AirbrakeLibrary(Library):
diff --git a/bears_flight_simulation/core/flight_simulation.py b/bears_flight_simulation/core/flight_simulation.py
@@ -1,49 +1,49 @@
 import logging
-from pathlib import Path
 import math
+from pathlib import Path
 
-from bears_flight_simulation.parsers.config import Config
-from bears_flight_simulation.parsers.fins_config import FinsConfig
-from bears_flight_simulation.parsers.location import Location
-from bears_flight_simulation.parsers.motor_config import MotorConfig
-from bears_flight_simulation.parsers.nose_cone_config import NoseConeConfig
-from bears_flight_simulation.parsers.parachute_config import ParachuteConfig
-from bears_flight_simulation.parsers.airbrake_config import AirbrakeConfig
-from bears_flight_simulation.parsers.weather_config import WeatherConfig
-from bears_flight_simulation.parsers.parts_list_parser import (
-    Part,
-    get_nosecone_total_length,
-    get_nosecone_tip_position_plus_length,
-    get_motor_position,
-)
-from bears_flight_simulation.parsers.rail_button_config import RailButtonConfig
-from bears_flight_simulation.hacks.matplotlib_hacks import (
-    hack_override_matplotlib_show,
-    hack_override_matplotlib_show_reset,
-)
-from rocketpy import Environment, Flight, Rocket, SolidMotor, AirBrakes, MonteCarlo
+from rocketpy import AirBrakes, Environment, Flight, MonteCarlo, Rocket, SolidMotor
 from rocketpy.stochastic import (
+    StochasticAirBrakes,
     StochasticEnvironment,
     StochasticFlight,
     StochasticParachute,
     StochasticRocket,
     StochasticSolidMotor,
-    StochasticAirBrakes,
 )
 
-from bears_flight_simulation.utilities.rocket_calculations import (
-    calculate_rocket_mass_without_motor_in_kg,
-    calculate_rocket_mass_in_kg,
+from bears_flight_simulation.exporters.airbrake_export import (
+    plot_airbrake_deployment_over_time,
 )
-from bears_flight_simulation.utilities.config_calc import rocket_center_of_mass
+from bears_flight_simulation.exporters.altitude_plots import plot_altitude_over_time
 from bears_flight_simulation.exporters.flight_data_export import (
     export_flight_data_to_csv,
     export_flight_data_to_csv_in_simulated_sensor_module_format,
 )
-from bears_flight_simulation.exporters.airbrake_export import (
-    plot_airbrake_deployment_over_time,
+from bears_flight_simulation.hacks.matplotlib_hacks import (
+    hack_override_matplotlib_show,
+    hack_override_matplotlib_show_reset,
+)
+from bears_flight_simulation.parsers.airbrake_config import AirbrakeConfig
+from bears_flight_simulation.parsers.config import Config
+from bears_flight_simulation.parsers.fins_config import FinsConfig
+from bears_flight_simulation.parsers.location import Location
+from bears_flight_simulation.parsers.motor_config import MotorConfig
+from bears_flight_simulation.parsers.nose_cone_config import NoseConeConfig
+from bears_flight_simulation.parsers.parachute_config import ParachuteConfig
+from bears_flight_simulation.parsers.parts_list_parser import (
+    Part,
+    get_motor_position,
+    get_nosecone_tip_position_plus_length,
+    get_nosecone_total_length,
+)
+from bears_flight_simulation.parsers.rail_button_config import RailButtonConfig
+from bears_flight_simulation.parsers.weather_config import WeatherConfig
+from bears_flight_simulation.utilities.config_calc import rocket_center_of_mass
+from bears_flight_simulation.utilities.rocket_calculations import (
+    calculate_rocket_mass_in_kg,
+    calculate_rocket_mass_without_motor_in_kg,
 )
-from bears_flight_simulation.exporters.altitude_plots import plot_altitude_over_time
 
 
 def wind_speed_and_direction_to_east_and_north(
diff --git a/bears_flight_simulation/core/library.py b/bears_flight_simulation/core/library.py
@@ -1,9 +1,9 @@
 import os
-import yaml
-
 from abc import ABC
 from pathlib import Path
 
+import yaml
+
 from bears_flight_simulation.core.library_entry import LibraryEntry
 
 
diff --git a/bears_flight_simulation/core/motor_library.py b/bears_flight_simulation/core/motor_library.py
@@ -1,7 +1,6 @@
-from bears_flight_simulation.parsers.motor_config import MotorConfig
-
 from bears_flight_simulation.core.library import Library
 from bears_flight_simulation.core.library_entry import LibraryEntry
+from bears_flight_simulation.parsers.motor_config import MotorConfig
 
 
 class MotorLibrary(Library):
diff --git a/bears_flight_simulation/core/parachute_library.py b/bears_flight_simulation/core/parachute_library.py
@@ -1,7 +1,6 @@
-from bears_flight_simulation.parsers.parachute_config import ParachuteConfig
-
 from bears_flight_simulation.core.library import Library
 from bears_flight_simulation.core.library_entry import LibraryEntry
+from bears_flight_simulation.parsers.parachute_config import ParachuteConfig
 
 
 class ParachuteLibrary(Library):
diff --git a/bears_flight_simulation/exporters/airbrake_export.py b/bears_flight_simulation/exporters/airbrake_export.py
@@ -1,7 +1,7 @@
-import matplotlib.pyplot as plt
-from pathlib import Path
 import math
+from pathlib import Path
 
+import matplotlib.pyplot as plt
 from rocketpy import Flight
 
 
diff --git a/bears_flight_simulation/exporters/altitude_plots.py b/bears_flight_simulation/exporters/altitude_plots.py
@@ -1,9 +1,9 @@
-import matplotlib.pyplot as plt
-import numpy as np
-from pathlib import Path
 import math
+from pathlib import Path
 
-from rocketpy import Flight, Environment
+import matplotlib.pyplot as plt
+import numpy as np
+from rocketpy import Environment, Flight
 
 TIME_STEP_SECONDS = 0.1
 
diff --git a/bears_flight_simulation/exporters/flight_data_export.py b/bears_flight_simulation/exporters/flight_data_export.py
@@ -1,8 +1,8 @@
 import csv
 from pathlib import Path
-import numpy as np
 
-from rocketpy import Flight, Environment
+import numpy as np
+from rocketpy import Environment, Flight
 
 
 def export_flight_data_to_csv(
diff --git a/bears_flight_simulation/gui/asset_library_editor_main_widget.py b/bears_flight_simulation/gui/asset_library_editor_main_widget.py
@@ -1,21 +1,22 @@
 # type: ignore
 
 import sys
+
 from PySide6.QtCore import QMargins
 from PySide6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
-    QHBoxLayout,
-    QSpacerItem,
-    QSizePolicy,
     QApplication,
+    QHBoxLayout,
     QPushButton,
+    QSizePolicy,
+    QSpacerItem,
+    QVBoxLayout,
+    QWidget,
 )
 
+from bears_flight_simulation.gui.cloeseable_window_widget import CloseableWindowWidget
 from bears_flight_simulation.gui.location_library_editor_widget import (
     LocationLibraryEditorWidget,
 )
-from bears_flight_simulation.gui.cloeseable_window_widget import CloseableWindowWidget
 
 
 class AssetLibraryEditorMainWidget(CloseableWindowWidget):
diff --git a/bears_flight_simulation/gui/cloeseable_window_widget.py b/bears_flight_simulation/gui/cloeseable_window_widget.py
@@ -1,4 +1,5 @@
 import typing as t
+
 from PySide6.QtCore import Signal
 from PySide6.QtWidgets import QWidget
 
diff --git a/bears_flight_simulation/gui/editor_main_widget.py b/bears_flight_simulation/gui/editor_main_widget.py
@@ -1,16 +1,17 @@
 # type: ignore
 
 import sys
+
+from PySide6.QtCore import QMargins
 from PySide6.QtWidgets import (
-    QVBoxLayout,
+    QApplication,
     QHBoxLayout,
+    QPushButton,
+    QSizePolicy,
     QSpacerItem,
+    QVBoxLayout,
     QWidget,
-    QSizePolicy,
-    QPushButton,
-    QApplication,
 )
-from PySide6.QtCore import QMargins
 
 
 class EditorMainWidget(QWidget):
diff --git a/bears_flight_simulation/gui/flight_simulation_gui.py b/bears_flight_simulation/gui/flight_simulation_gui.py
@@ -1,25 +1,26 @@
 # type: ignore
 
 from shutil import copytree
+
 from PySide6.QtCore import QMargins, QUrl
+from PySide6.QtGui import QDesktopServices
 from PySide6.QtSvgWidgets import QSvgWidget
 from PySide6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
-    QHBoxLayout,
-    QSpacerItem,
-    QSizePolicy,
-    QPushButton,
     QComboBox,
+    QHBoxLayout,
     QInputDialog,
+    QPushButton,
+    QSizePolicy,
+    QSpacerItem,
+    QVBoxLayout,
+    QWidget,
 )
-from PySide6.QtGui import QDesktopServices
 
 from bears_flight_simulation.common.common_paths import (
-    USER_SIMULATION_CONFIG_BASE_FOLDER,
+    LOGO_PATH,
     OUTPUT_FOLDER,
     TEMPLATE_FOLDER,
-    LOGO_PATH,
+    USER_SIMULATION_CONFIG_BASE_FOLDER,
     get_simulation_entries,
 )
 from bears_flight_simulation.gui.asset_library_editor_main_widget import (
diff --git a/bears_flight_simulation/gui/library_selector_widget.py b/bears_flight_simulation/gui/library_selector_widget.py
@@ -1,17 +1,18 @@
 # type: ignore
 
-from collections.abc import Callable
 import sys
+from collections.abc import Callable
 from pathlib import Path
+
+from PySide6.QtCore import Signal
 from PySide6.QtWidgets import (
-    QListWidget,
-    QWidget,
-    QVBoxLayout,
+    QApplication,
     QHBoxLayout,
+    QListWidget,
     QPushButton,
-    QApplication,
+    QVBoxLayout,
+    QWidget,
 )
-from PySide6.QtCore import Signal
 
 # from bears_flight_simulation.simulation.core.library import Library
 # from bears_flight_simulation.simulation.core.library_entry import LibraryEntry
diff --git a/bears_flight_simulation/gui/location_library_editor_widget.py b/bears_flight_simulation/gui/location_library_editor_widget.py
@@ -3,19 +3,19 @@
 import sys
 
 from PySide6.QtWidgets import (
-    QWidget,
-    QHBoxLayout,
+    QApplication,
+    QDoubleSpinBox,
     QFormLayout,
+    QHBoxLayout,
     QLabel,
-    QDoubleSpinBox,
-    QApplication,
+    QWidget,
 )
 
 from bears_flight_simulation.common.common_paths import (
     get_location_entries,
 )
-from bears_flight_simulation.gui.library_selector_widget import LibrarySelectorWidget
 from bears_flight_simulation.gui.cloeseable_window_widget import CloseableWindowWidget
+from bears_flight_simulation.gui.library_selector_widget import LibrarySelectorWidget
 
 
 class LocationLibraryEditorWidget(CloseableWindowWidget):
diff --git a/bears_flight_simulation/hacks/matplotlib_hacks.py b/bears_flight_simulation/hacks/matplotlib_hacks.py
@@ -1,7 +1,8 @@
 import logging
+import random
 from pathlib import Path
+
 import matplotlib.pyplot as plt
-import random
 
 SAVEFIG_DPI = 300
 
diff --git a/bears_flight_simulation/parsers/airbrake_config.py b/bears_flight_simulation/parsers/airbrake_config.py
@@ -1,13 +1,12 @@
 import typing as t
-
 from pathlib import Path
 
 from bears_flight_simulation.core.library_entry import LibraryEntry
 from bears_flight_simulation.utilities.airbrake_controllers import (
     disabled_controller,
     enabled_controller,
-    stupid_full_extension_controller,
     stargaze_airbrake_controller,
+    stupid_full_extension_controller,
 )
 
 
diff --git a/bears_flight_simulation/parsers/config.py b/bears_flight_simulation/parsers/config.py
@@ -1,5 +1,5 @@
-from datetime import datetime
 import typing as t
+from datetime import datetime
 
 import yaml
 
diff --git a/bears_flight_simulation/parsers/motor_config.py b/bears_flight_simulation/parsers/motor_config.py
@@ -1,6 +1,5 @@
-from bears_flight_simulation.utilities.config_calc import grainCom, grainDensity
-
 from bears_flight_simulation.core.library_entry import LibraryEntry
+from bears_flight_simulation.utilities.config_calc import grainCom, grainDensity
 
 
 class MotorConfig(LibraryEntry):
diff --git a/bears_flight_simulation/parsers/parts_list_parser.py b/bears_flight_simulation/parsers/parts_list_parser.py
@@ -4,6 +4,7 @@
 import typing as t
 from dataclasses import dataclass
 from pathlib import Path
+
 import matplotlib.pyplot as plt
 
 
diff --git a/bears_flight_simulation/simulation.py b/bears_flight_simulation/simulation.py
diff --git a/bears_flight_simulation/simulation_gui.py b/bears_flight_simulation/simulation_gui.py
diff --git a/bears_flight_simulation/utilities/airbrake_controllers.py b/bears_flight_simulation/utilities/airbrake_controllers.py
diff --git a/bears_flight_simulation/utilities/config_calc.py b/bears_flight_simulation/utilities/config_calc.py
diff --git a/scripts/fix-and-filter-ras-aero-2-csv.py b/scripts/fix-and-filter-ras-aero-2-csv.py
diff --git a/tests/hacks/test_matplotlib_hacks.py b/tests/hacks/test_matplotlib_hacks.py
diff --git a/tests/utilities/test_airbrake_controllers.py b/tests/utilities/test_airbrake_controllers.py
