STY: Update to latest ruff (#214)

src/fmu/tools/qcproperties/_aggregate_df.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 import pandas as pd
+
 from fmu.tools._common import _QCCommon
 from fmu.tools.qcproperties._utils import list_combinations
 

src/fmu/tools/qcproperties/_grid2df.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
 import pandas as pd
+
 from fmu.tools._common import _QCCommon
 from fmu.tools.qcdata import QCData
 from fmu.tools.qcproperties._config_parser import ConfigParser

src/fmu/tools/qcproperties/_well2df.py

@@ -1,6 +1,7 @@
 from typing import Any, List, Optional
 
 import pandas as pd
+
 from fmu.tools._common import _QCCommon
 from fmu.tools.qcdata import QCData
 from fmu.tools.qcproperties._config_parser import ConfigParser

src/fmu/tools/qcproperties/qcproperties.py

@@ -5,6 +5,7 @@
 
 import pandas as pd
 import yaml
+
 from fmu.tools._common import _QCCommon
 from fmu.tools.qcdata import QCData
 from fmu.tools.qcproperties._aggregate_df import PropertyAggregation

tests/fipmapper/test_disjointsets.py

@@ -1,8 +1,9 @@
 import pandas as pd
 import pytest
-from fmu.tools.fipmapper import fipmapper
 from packaging import version
 
+from fmu.tools.fipmapper import fipmapper
+
 
 @pytest.mark.skipif(
     version.parse(pd.__version__) < version.parse("0.25.2"),

tests/fipmapper/test_fipmapper.py

@@ -1,4 +1,5 @@
 import pytest
+
 from fmu.tools.fipmapper import fipmapper
 
 

tests/properties/test_swfunction.py

@@ -7,6 +7,7 @@
 import numpy as np
 import pytest
 import xtgeo
+
 from fmu.tools.properties import SwFunction
 
 TPATH = Path("../xtgeo-testdata")

tests/qcforward/test_bw_vs_gridprops.py

@@ -5,6 +5,7 @@
 
 import pandas as pd
 import pytest
+
 from fmu.tools import qcforward as qcf
 
 # filedata

tests/qcforward/test_grid_statistics.py

@@ -2,6 +2,7 @@
 
 import pandas as pd
 import pytest
+
 from fmu.tools import qcforward as qcf
 
 

tests/qcforward/test_gridquality.py

@@ -2,10 +2,11 @@
 
 import pathlib
 
-import fmu.tools.qcforward as qcf
 import pandas as pd
 import pytest
 
+import fmu.tools.qcforward as qcf
+
 # filedata
 PATH = pathlib.Path(".").resolve().as_posix()
 GRIDFILE = "../xtgeo-testdata/3dgrids/reek/reek_sim_grid.roff"

tests/qcforward/test_wellzonation_vs_grid.py

@@ -2,10 +2,11 @@
 
 from os.path import abspath
 
-import fmu.tools.qcforward as qcf
 import pandas as pd
 import pytest
 
+import fmu.tools.qcforward as qcf
+
 ZONENAME = "Zone"
 ZONELOGNAME = "Zonelog"
 PERFLOGNAME = "PERF"

tests/qcproperties/test_qcproperties.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
 import pytest
+
 from fmu.tools.qcdata import QCData
 from fmu.tools.qcproperties._grid2df import GridProps2df
 from fmu.tools.qcproperties._well2df import WellLogs2df

tests/rms/test_create_rft_ertobs.py

@@ -9,6 +9,7 @@
 import numpy as np
 import pandas as pd
 import pytest
+
 from fmu.tools._common import preserve_cwd
 from fmu.tools.rms import create_rft_ertobs
 from fmu.tools.rms.create_rft_ertobs import check_and_parse_config

tests/rms/test_import_localmodule.py

@@ -3,8 +3,9 @@
 import os
 import sys
 
-import fmu.tools.rms as toolsrms
 import pytest
+
+import fmu.tools.rms as toolsrms
 from fmu.tools._common import preserve_cwd
 
 SNIPPET1 = """

tests/rms/test_rename_rms_scripts.py

@@ -6,6 +6,7 @@
 from textwrap import dedent
 
 import pytest
+
 from fmu.tools._common import preserve_cwd
 from fmu.tools.rms.rename_rms_scripts import PythonCompMaster, main
 

tests/rms/test_rmsvolumetrics.py

@@ -6,6 +6,7 @@
 
 import pandas as pd
 import pytest
+
 from fmu.tools.rms import volumetrics
 
 TESTDIR = Path(__file__).parent / "volumetricsdata"

tests/sensitivities/test_calc_tornado.py

@@ -2,9 +2,10 @@
 
 import pandas as pd
 import pytest
-from fmu.tools.sensitivities import calc_tornadoinput, summarize_design
 from packaging import version
 
+from fmu.tools.sensitivities import calc_tornadoinput, summarize_design
+
 TESTDATA = Path(__file__).parent / "data"
 
 

tests/sensitivities/test_create_design.py

@@ -4,9 +4,10 @@
 
 import pandas as pd
 import pytest
-from fmu.tools.sensitivities import DesignMatrix, excel2dict_design
 from packaging import version
 
+from fmu.tools.sensitivities import DesignMatrix, excel2dict_design
+
 TESTDATA = Path(__file__).parent / "data"
 
 

tests/sensitivities/test_design_distributions.py

@@ -3,6 +3,7 @@
 import numbers
 
 import pytest
+
 from fmu.tools.sensitivities import design_distributions as dists
 
 # pylint: disable=protected-access

tests/sensitivities/test_designmatrix.py

@@ -6,9 +6,10 @@
 
 import pandas as pd
 import pytest
+from packaging import version
+
 from fmu.tools._common import preserve_cwd
 from fmu.tools.sensitivities import DesignMatrix
-from packaging import version
 
 TESTDATA = Path(__file__).parent / "data"
 

tests/sensitivities/test_excel2dict.py

@@ -5,10 +5,11 @@
 import numpy as np
 import pandas as pd
 import pytest
+from packaging import version
+
 from fmu.tools._common import preserve_cwd
 from fmu.tools.sensitivities import excel2dict_design, inputdict_to_yaml
 from fmu.tools.sensitivities._excel2dict import _has_value
-from packaging import version
 
 MOCK_GENERAL_INPUT = pd.DataFrame(
     data=[

tests/sensitivities/test_use_cases.py

@@ -2,9 +2,10 @@
 
 import pandas as pd
 import pytest
+from packaging import version
+
 from fmu.tools._common import preserve_cwd
 from fmu.tools.sensitivities import DesignMatrix, excel2dict_design
-from packaging import version
 
 
 @preserve_cwd

tests/test_ensembles/test_ensemble_well_props.py

@@ -7,6 +7,7 @@
 import pytest
 import xtgeo
 import yaml
+
 from fmu.tools._common import preserve_cwd
 from fmu.tools.ensembles import ensemble_well_props
 

tests/test_extract_zone_tops.py

@@ -1,6 +1,7 @@
 from os.path import abspath
 
 import pytest
+
 from fmu.tools import extract_grid_zone_tops
 
 GRID = abspath("../xtgeo-testdata/3dgrids/reek/reek_sim_grid.roff")

tests/test_qcdata.py

@@ -4,6 +4,7 @@
 
 import pytest
 import xtgeo
+
 from fmu.tools.qcdata import QCData
 
 # filedata