From 4689da528523d07c059ac4d1c28127214e9ee353 Mon Sep 17 00:00:00 2001 From: Rafael M Mudafort Date: Thu, 7 Nov 2024 13:02:11 -0600 Subject: [PATCH] Lint and support older Python versions --- floris/core/turbine/__init__.py | 2 +- floris/core/turbine/mit_turbine.py | 2 ++ floris/core/turbine/turbine.py | 2 +- tests/turbine_operation_models_unit_test.py | 3 +-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/floris/core/turbine/__init__.py b/floris/core/turbine/__init__.py index 7eae2107e..d76bee720 100644 --- a/floris/core/turbine/__init__.py +++ b/floris/core/turbine/__init__.py @@ -1,4 +1,5 @@ +from floris.core.turbine.mit_turbine import MITTurbine from floris.core.turbine.operation_models import ( AWCTurbine, CosineLossTurbine, @@ -7,4 +8,3 @@ SimpleDeratingTurbine, SimpleTurbine, ) -from floris.core.turbine.mit_turbine import MITTurbine diff --git a/floris/core/turbine/mit_turbine.py b/floris/core/turbine/mit_turbine.py index e2a4d8784..2fcc317c7 100644 --- a/floris/core/turbine/mit_turbine.py +++ b/floris/core/turbine/mit_turbine.py @@ -1,4 +1,6 @@ +from __future__ import annotations + from dataclasses import dataclass from typing import ( Any, diff --git a/floris/core/turbine/turbine.py b/floris/core/turbine/turbine.py index e586ffef7..07e96b44b 100644 --- a/floris/core/turbine/turbine.py +++ b/floris/core/turbine/turbine.py @@ -15,11 +15,11 @@ from floris.core.turbine import ( AWCTurbine, CosineLossTurbine, + MITTurbine, MixedOperationTurbine, PeakShavingTurbine, SimpleDeratingTurbine, SimpleTurbine, - MITTurbine, ) from floris.type_dec import ( convert_to_path, diff --git a/tests/turbine_operation_models_unit_test.py b/tests/turbine_operation_models_unit_test.py index 2567f690c..8aab240c5 100644 --- a/tests/turbine_operation_models_unit_test.py +++ b/tests/turbine_operation_models_unit_test.py @@ -1,6 +1,7 @@ import numpy as np import pytest +from floris.core.turbine.mit_turbine import MITTurbine from floris.core.turbine.operation_models import ( AWCTurbine, CosineLossTurbine, @@ -10,7 +11,6 @@ SimpleDeratingTurbine, SimpleTurbine, ) -from floris.core.turbine.mit_turbine import MITTurbine from floris.utilities import cosd from tests.conftest import SampleInputs, WIND_SPEEDS @@ -715,4 +715,3 @@ def test_MITTurbine(): tilt_interp=None ) assert test_power < baseline_power -