MNT: refactors cached_property imports

Author: Gui-FernandesBR

rocketpy/environment/environment_analysis.py

@@ -3,16 +3,12 @@
 import datetime
 import json
 from collections import defaultdict
+from functools import cached_property
 
 import netCDF4
 import numpy as np
 import pytz
 
-try:
-    from functools import cached_property
-except ImportError:
-    from ..tools import cached_property
-
 from ..mathutils.function import Function
 from ..plots.environment_analysis_plots import _EnvironmentAnalysisPlots
 from ..prints.environment_analysis_prints import _EnvironmentAnalysisPrints

rocketpy/mathutils/function.py

@@ -7,18 +7,14 @@
 import warnings
 from collections.abc import Iterable
 from copy import deepcopy
+from functools import cached_property
 from inspect import signature
 from pathlib import Path
 
 import matplotlib.pyplot as plt
 import numpy as np
 from scipy import integrate, linalg, optimize
 
-try:
-    from functools import cached_property
-except ImportError:
-    from ..tools import cached_property
-
 NUMERICAL_TYPES = (float, int, complex, np.ndarray, np.integer, np.floating)
 
 

rocketpy/mathutils/vector_matrix.py

@@ -1,8 +1,7 @@
 from cmath import isclose
+from functools import cached_property
 from itertools import product
 
-from rocketpy.tools import cached_property
-
 
 class Vector:
     """Pure python basic R3 vector class designed for simple operations.

rocketpy/motors/hybrid_motor.py

@@ -1,3 +1,5 @@
+from functools import cached_property
+
 from rocketpy.tools import parallel_axis_theorem_from_com
 
 from ..mathutils.function import Function, funcify_method, reset_funcified_methods
@@ -7,11 +9,6 @@
 from .motor import Motor
 from .solid_motor import SolidMotor
 
-try:
-    from functools import cached_property
-except ImportError:
-    from ..tools import cached_property
-
 
 class HybridMotor(Motor):
     """Class to specify characteristics and useful operations for Hybrid

rocketpy/motors/liquid_motor.py

@@ -1,4 +1,4 @@
-import warnings
+from functools import cached_property
 
 import numpy as np
 
@@ -13,11 +13,6 @@
 from ..prints.liquid_motor_prints import _LiquidMotorPrints
 from .motor import Motor
 
-try:
-    from functools import cached_property
-except ImportError:
-    from ..tools import cached_property
-
 
 class LiquidMotor(Motor):
     """Class to specify characteristics and useful operations for Liquid

rocketpy/motors/motor.py

@@ -1,6 +1,7 @@
 import re
 import warnings
 from abc import ABC, abstractmethod
+from functools import cached_property
 
 import numpy as np
 
@@ -9,11 +10,6 @@
 from ..prints.motor_prints import _MotorPrints
 from ..tools import parallel_axis_theorem_from_com, tuple_handler
 
-try:
-    from functools import cached_property
-except ImportError:
-    from ..tools import cached_property
-
 
 class Motor(ABC):
     """Abstract class to specify characteristics and useful operations for

rocketpy/motors/solid_motor.py

@@ -1,3 +1,5 @@
+from functools import cached_property
+
 import numpy as np
 from scipy import integrate
 
@@ -6,11 +8,6 @@
 from ..prints.solid_motor_prints import _SolidMotorPrints
 from .motor import Motor
 
-try:
-    from functools import cached_property
-except ImportError:
-    from ..tools import cached_property
-
 
 class SolidMotor(Motor):
     """Class to specify characteristics and useful operations for solid motors.

rocketpy/motors/tank_geometry.py

@@ -11,10 +11,7 @@
 
     cache = lru_cache(maxsize=None)
 
-try:
-    from functools import cached_property
-except ImportError:
-    from ..tools import cached_property
+from functools import cached_property
 
 
 class TankGeometry:

rocketpy/plots/flight_plots.py

@@ -1,11 +1,8 @@
+from functools import cached_property
+
 import matplotlib.pyplot as plt
 import numpy as np
 
-try:
-    from functools import cached_property
-except ImportError:
-    from ..tools import cached_property
-
 
 class _FlightPlots:
     """Class that holds plot methods for Flight class.

rocketpy/rocket/aero_surface.py

@@ -1,6 +1,5 @@
 import warnings
 from abc import ABC, abstractmethod
-from functools import cached_property
 
 import numpy as np
 from scipy.optimize import fsolve

rocketpy/tools.py

@@ -7,9 +7,6 @@
 import pytz
 from cftime import num2pydate
 from packaging import version as packaging_version
-from functools import cached_property
-
-_NOT_FOUND = object()
 
 # Mapping of module name and the name of the package that should be installed
 INSTALL_MAPPING = {"IPython": "ipython"}