Merge pull request #84 from fast-aircraft-design/add-isort

Add isort linting rules to be consistent with core repo

Author: enricostragiotti

pyproject.toml

@@ -138,27 +138,3 @@ exclude_lines = [
     "if 0:",
     "if __name__ = = .__main__.:",
 ]
-
-
-# Ruff settings ================================================================
-[tool.ruff]
-line-length    = 100
-target-version = "py310"
-extend-include = ["*.ipynb"]
-
-[tool.ruff.lint]
-# Enable Pyflakes `F`) and a subset of the pycodestyle `E`)  codes by default.
-# Unlike Flake8, Ruff doesn't enable pycodestyle warnings `W`) or
-# McCabe complexity `C901`) by default.
-select = [
-    "E4",
-    "E7",
-    "E9",
-    "F",
-]
-ignore = []
-# Allow fix for all enabled rules (when `--fix`) is provided.
-fixable   = ["ALL"]
-unfixable = []
-# Allow unused variables when underscore-prefixed.
-dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

ruff.toml

@@ -0,0 +1,47 @@
+line-length    = 100
+target-version = "py310"
+extend-include = ["*.ipynb"]
+
+[lint]
+# Enable Pyflakes `F`) and a subset of the pycodestyle `E`)  codes by default.
+# Unlike Flake8, Ruff doesn't enable pycodestyle warnings `W`) or
+# McCabe complexity `C901`) by default.
+select = [
+    "E4",
+    "E7",
+    "E9",
+    "F",
+    "I",   # Import sorting using isort rules
+]
+ignore = []
+# Allow fix for all enabled rules (when `--fix`) is provided.
+fixable   = ["ALL"]
+unfixable = []
+# Allow unused variables when underscore-prefixed.
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+[lint.isort] # Add optional configurations for import organization
+case-sensitive = true
+relative-imports-order = "closest-to-furthest"
+
+[lint.pylint] # Add optional configurations for pylint
+max-args = 8
+
+[lint.pep8-naming] # A list of names (or patterns) to ignore when considering pep8-naming violations. Supports glob patterns.
+ignore-names = [
+    "*MTOW*",
+    "*TOW*",
+    "*OWE*",
+    "*2D*",
+    "*3D*",
+    "*AR*",
+    "*CL*",
+    "*CD*",
+    "*TAS*",
+    "*EAS*",
+    "*IAS*",
+    "*CAS*",
+    "*Mach*",
+    "*MPI*",
+    "I_*",
+]

src/fastoad_cs25/models/aerodynamics/aerodynamics_high_speed.py

@@ -12,9 +12,9 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import fastoad.api as oad
 import openmdao.api as om
 from fastoad.module_management.constants import ModelDomain
-import fastoad.api as oad
 
 from .constants import (
     SERVICE_ALPHA,

src/fastoad_cs25/models/aerodynamics/aerodynamics_landing.py

@@ -14,11 +14,10 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import fastoad.api as oad
 import numpy as np
 import openmdao.api as om
 from fastoad.module_management.constants import ModelDomain
-import fastoad.api as oad
-
 from stdatm import Atmosphere
 
 from .constants import (

src/fastoad_cs25/models/aerodynamics/aerodynamics_low_speed.py

@@ -12,12 +12,11 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import fastoad.api as oad
 import openmdao.api as om
 from fastoad.module_management.constants import ModelDomain
-import fastoad.api as oad
 
 from .constants import (
-    PolarType,
     SERVICE_ALPHA,
     SERVICE_CD0,
     SERVICE_CD_TRIM,
@@ -27,6 +26,7 @@
     SERVICE_OSWALD_COEFFICIENT,
     SERVICE_POLAR,
     SERVICE_REYNOLDS_COEFFICIENT,
+    PolarType,
 )
 
 

src/fastoad_cs25/models/aerodynamics/aerodynamics_takeoff.py

@@ -12,11 +12,11 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import fastoad.api as oad
 import openmdao.api as om
 from fastoad.module_management.constants import ModelDomain
-import fastoad.api as oad
 
-from .constants import PolarType, SERVICE_HIGH_LIFT, SERVICE_POLAR
+from .constants import SERVICE_HIGH_LIFT, SERVICE_POLAR, PolarType
 
 
 @oad.RegisterOpenMDAOSystem("fastoad.aerodynamics.takeoff.legacy", domain=ModelDomain.AERODYNAMICS)

src/fastoad_cs25/models/aerodynamics/components/cd0.py

@@ -12,8 +12,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import openmdao.api as om
 import fastoad.api as oad
+import openmdao.api as om
 
 from ..constants import (
     SERVICE_CD0,

src/fastoad_cs25/models/aerodynamics/components/cd0_fuselage.py

@@ -12,9 +12,9 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import fastoad.api as oad
 import numpy as np
 import openmdao.api as om
-import fastoad.api as oad
 
 from .utils.friction_drag import get_flat_plate_friction_drag_coefficient
 from ..constants import SERVICE_CD0_FUSELAGE

src/fastoad_cs25/models/aerodynamics/components/cd0_ht.py

@@ -12,9 +12,9 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import fastoad.api as oad
 import numpy as np
 import openmdao.api as om
-import fastoad.api as oad
 
 from .utils.cd0_lifting_surface import (
     LiftingSurfaceGeometry,

src/fastoad_cs25/models/aerodynamics/components/cd0_nacelles_pylons.py

@@ -12,9 +12,9 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+import fastoad.api as oad
 import numpy as np
 import openmdao.api as om
-import fastoad.api as oad
 
 from .utils.friction_drag import get_flat_plate_friction_drag_coefficient
 from ..constants import SERVICE_CD0_NACELLES_PYLONS