STY: Update to latest ruff

docs/conf.py

@@ -1,8 +1,9 @@
 from datetime import date
 
-import xtgeo
 from autoclasstoc import PublicMethods
 
+import xtgeo
+
 version = xtgeo.__version__
 release = xtgeo.__version__
 project = "xtgeo"

examples/grid3d_compute_stats.py

@@ -7,6 +7,7 @@
 from os.path import join as ojn
 
 import numpy.ma as npma
+
 import xtgeo
 
 # from memory_profiler import profile

examples/grid3d_print_init_csv.py

@@ -6,6 +6,7 @@
 import tempfile
 
 import numpy as np
+
 import xtgeo
 
 EXPATH = pathlib.Path("../../xtgeo-testdata/3dgrids/reek")

examples/regsurf_compute_stats.py

@@ -8,6 +8,7 @@
 from os.path import join as ojn
 
 import numpy.ma as npma
+
 import xtgeo
 
 # from memory_profiler import profile

examples/wellpath_fence_sample.py

@@ -2,6 +2,7 @@
 from pathlib import Path
 
 import matplotlib.pyplot as plt
+
 import xtgeo
 
 TPATH = Path("../xtgeo-testdata")

tests/jupyter/xtgeo1.ipynb

@@ -23,7 +23,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "reekfile = '../xtgeo-testdata/3dgrids/reek/REEK.EGRID'\n",
+    "reekfile = \"../xtgeo-testdata/3dgrids/reek/REEK.EGRID\"\n",
     "reekgrid = xtgeo.grid3d.Grid(reekfile)"
    ]
   },

tests/test_common/test_calc.py

@@ -3,9 +3,10 @@
 
 import numpy as np
 import pytest
+from hypothesis import given, strategies as st
+
 import xtgeo
 import xtgeo.common.calc as xcalc
-from hypothesis import given, strategies as st
 from xtgeo import _cxtgeo
 
 xtg = xtgeo.XTGeoDialog()

tests/test_common/test_cxtgeo_lowlevel.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 import pytest
+
 import xtgeo
 from xtgeo import _cxtgeo
 

tests/test_common/test_sys.py

@@ -1,6 +1,7 @@
 import hashlib
 
 import pytest
+
 from xtgeo.common.sys import generic_hash
 
 

tests/test_cube/test_cube.py

@@ -4,8 +4,9 @@
 import numpy as np
 import pytest
 import segyio
-import xtgeo
 from hypothesis import HealthCheck, given, settings
+
+import xtgeo
 from xtgeo.common import XTGeoDialog
 from xtgeo.cube import Cube
 from xtgeo.cube._cube_import import (

tests/test_cube/test_cube_xtgformats_io.py

@@ -2,9 +2,10 @@
 from os.path import join
 
 import pytest
-import xtgeo
 from numpy.testing import assert_allclose
 
+import xtgeo
+
 
 @pytest.mark.benchmark(group="import/export")
 def test_benchmark_cube_export(benchmark, tmp_path, testdata_path):

tests/test_etc/test_clib_errors.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 import pytest
+
 import xtgeo
 from xtgeo import _cxtgeo
 from xtgeo.io._file import FileWrapper

tests/test_etc/test_etc_make_avg_maps.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 import pytest
+
 import xtgeo
 from xtgeo.common import XTGeoDialog
 from xtgeo.surface import RegularSurface

tests/test_etc/test_etc_make_hcpv_maps.py

@@ -3,6 +3,7 @@
 import numpy as np
 import numpy.ma as ma
 import pytest
+
 import xtgeo
 from xtgeo.common import XTGeoDialog
 from xtgeo.surface import RegularSurface

tests/test_grid3d/eclrun_fixtures.py

@@ -1,6 +1,7 @@
 from os.path import join
 
 import pytest
+
 import xtgeo
 
 

tests/test_grid3d/egrid_generator.py

@@ -1,8 +1,9 @@
 import hypothesis.strategies as st
 import numpy as np
-import xtgeo.grid3d._egrid as xtge
 from hypothesis.extra.numpy import arrays
 
+import xtgeo.grid3d._egrid as xtge
+
 from .grdecl_grid_generator import (
     coordinate_types,
     finites,

tests/test_grid3d/grdecl_grid_generator.py

@@ -1,8 +1,9 @@
 import hypothesis.strategies as st
 import numpy as np
+from hypothesis.extra.numpy import arrays
+
 import xtgeo.grid3d._ecl_grid as eclgrid
 import xtgeo.grid3d._grdecl_grid as ggrid
-from hypothesis.extra.numpy import arrays
 
 from .grid_generator import indices
 

tests/test_grid3d/grid_generator.py

@@ -1,4 +1,5 @@
 import hypothesis.strategies as st
+
 import xtgeo
 
 indices = st.integers(min_value=4, max_value=6)

tests/test_grid3d/gridprop_generator.py

@@ -1,6 +1,7 @@
 import hypothesis.strategies as st
 import numpy as np
 from hypothesis.extra.numpy import arrays
+
 from xtgeo.grid3d import GridProperty
 
 from .grdecl_grid_generator import finites

tests/test_grid3d/test_ecl_inte_head.py

@@ -1,5 +1,6 @@
 import numpy as np
 import pytest
+
 from xtgeo.grid3d._ecl_inte_head import InteHead, Phases
 from xtgeo.grid3d._ecl_output_file import Simulator, TypeOfGrid, UnitSystem
 

tests/test_grid3d/test_ecl_logi_head.py

@@ -1,4 +1,5 @@
 import numpy as np
+
 from xtgeo.grid3d._ecl_logi_head import LogiHead
 from xtgeo.grid3d._ecl_output_file import Simulator
 

tests/test_grid3d/test_ecl_simpleb8_cases.py

@@ -22,6 +22,7 @@
 import numpy as np
 import pytest
 import resfo
+
 import xtgeo
 
 xtg = xtgeo.XTGeoDialog()

tests/test_grid3d/test_eclrun.py

@@ -3,6 +3,7 @@
 
 import numpy as np
 import pytest
+
 import xtgeo
 
 from .eclrun_fixtures import *  # noqa: F401, F403

tests/test_grid3d/test_grdecl_format.py

@@ -1,6 +1,7 @@
 from unittest.mock import mock_open, patch
 
 import pytest
+
 from xtgeo.grid3d._grdecl_format import open_grdecl
 
 

tests/test_grid3d/test_grid.py

@@ -6,8 +6,9 @@
 
 import numpy as np
 import pytest
-import xtgeo
 from hypothesis import given
+
+import xtgeo
 from xtgeo.common import XTGeoDialog
 from xtgeo.grid3d import Grid
 

tests/test_grid3d/test_grid_bytesio.py

@@ -7,6 +7,7 @@
 import io
 
 import numpy as np
+
 import xtgeo
 
 

tests/test_grid3d/test_grid_dual_index.py

@@ -57,6 +57,7 @@
 
 import numpy as np
 import pytest
+
 import xtgeo.grid3d.grid
 
 

tests/test_grid3d/test_grid_ecl_grid.py

@@ -1,11 +1,12 @@
 import hypothesis.strategies as st
 import numpy as np
 import pytest
+from hypothesis import HealthCheck, assume, given, settings
+from numpy.testing import assert_allclose
+
 import xtgeo
 import xtgeo.grid3d._egrid as xtg_egrid
 import xtgeo.grid3d._grdecl_grid as ggrid
-from hypothesis import HealthCheck, assume, given, settings
-from numpy.testing import assert_allclose
 from xtgeo.grid3d._ecl_grid import (
     inverse_transform_xtgeo_coord_by_mapaxes,
     transform_xtgeo_coord_by_mapaxes,

tests/test_grid3d/test_grid_egrid.py

@@ -5,9 +5,10 @@
 import numpy as np
 import pytest
 import resfo
+from hypothesis import HealthCheck, assume, given, settings
+
 import xtgeo as xtg
 import xtgeo.grid3d._egrid as xtge
-from hypothesis import HealthCheck, assume, given, settings
 
 from .egrid_generator import (
     egrids,

tests/test_grid3d/test_grid_fence.py

@@ -1,6 +1,7 @@
 import pathlib
 
 import pytest
+
 import xtgeo
 
 REEKROOT = pathlib.Path("3dgrids/reek/REEK")

tests/test_grid3d/test_grid_grdecl.py

@@ -5,10 +5,11 @@
 import hypothesis.strategies as st
 import numpy as np
 import pytest
+from hypothesis import HealthCheck, assume, given, settings
+
 import xtgeo
 import xtgeo.grid3d._ecl_grid as ecl_grid
 import xtgeo.grid3d._grdecl_grid as ggrid
-from hypothesis import HealthCheck, assume, given, settings
 from xtgeo.grid3d import Grid
 from xtgeo.grid3d._grdecl_format import open_grdecl
 from xtgeo.grid3d._grid_import_ecl import grid_from_ecl_grid

tests/test_grid3d/test_grid_operations.py

@@ -3,9 +3,10 @@
 import pathlib
 
 import pytest
-import xtgeo
 from hypothesis import given
 
+import xtgeo
+
 from .grid_generator import xtgeo_grids
 
 EMEGFILE = pathlib.Path("3dgrids/eme/1/emerald_hetero_grid.roff")

tests/test_grid3d/test_grid_properties.py

@@ -5,8 +5,9 @@
 
 import hypothesis.strategies as st
 import pytest
-import xtgeo
 from hypothesis import assume, given
+
+import xtgeo
 from xtgeo.common import XTGeoDialog
 from xtgeo.common.exceptions import InvalidFileFormatError
 from xtgeo.grid3d import GridProperties, GridProperty

tests/test_grid3d/test_grid_property.py

@@ -8,8 +8,9 @@
 import numpy as np
 import numpy.ma as npma
 import pytest
-import xtgeo
 from hypothesis import HealthCheck, example, given, settings
+
+import xtgeo
 from xtgeo.common import XTGeoDialog
 from xtgeo.common.exceptions import KeywordNotFoundError
 from xtgeo.grid3d import GridProperty

tests/test_grid3d/test_grid_property_etc.py

@@ -2,6 +2,7 @@
 """Testing: test_grid_property more special functions"""
 
 import pytest
+
 from xtgeo.grid3d import _gridprop_roxapi
 
 

tests/test_grid3d/test_grid_property_grdecl.py

@@ -3,9 +3,10 @@
 import hypothesis.strategies as st
 import numpy as np
 import pytest
-import xtgeo
 from hypothesis import HealthCheck, assume, given, settings
 from numpy.testing import assert_allclose
+
+import xtgeo
 from xtgeo.grid3d._gridprop_import_grdecl import read_grdecl_3d_property
 
 from .grid_generator import xtgeo_grids as grids

tests/test_grid3d/test_grid_property_roff.py

@@ -4,9 +4,10 @@
 import numpy as np
 import pytest
 import roffio
-import xtgeo
 from hypothesis import HealthCheck, given, settings
 from hypothesis.extra.numpy import arrays
+
+import xtgeo
 from xtgeo.grid3d import GridProperty
 from xtgeo.grid3d._roff_parameter import RoffParameter
 

tests/test_grid3d/test_grid_roff.py

@@ -9,6 +9,7 @@
 from hypothesis import given
 from hypothesis.extra.numpy import arrays
 from numpy.testing import assert_allclose
+
 from xtgeo import _cxtgeo
 from xtgeo.grid3d import Grid
 from xtgeo.grid3d._grid_import_roff import handle_deprecated_xtgeo_roff_file

tests/test_grid3d/test_grid_specialcases.py

@@ -9,6 +9,7 @@
 import pathlib
 
 import pytest
+
 import xtgeo
 
 SPE9 = pathlib.Path("3dgrids/bench_spe9")

tests/test_grid3d/test_grid_vs_points.py

@@ -2,6 +2,7 @@
 
 import pandas as pd
 import pytest
+
 import xtgeo
 
 xtg = xtgeo.common.XTGeoDialog()

tests/test_grid3d/test_grid_vs_well.py

@@ -1,6 +1,7 @@
 import pathlib
 
 import pytest
+
 import xtgeo
 from xtgeo.common import XTGeoDialog
 

tests/test_grid3d/test_grid_xtgformats_io.py

@@ -6,9 +6,10 @@
 import hypothesis.strategies as st
 import numpy as np
 import pytest
-import xtgeo
 from hypothesis import HealthCheck, given, settings
 from numpy.testing import assert_allclose
+
+import xtgeo
 from xtgeo.common import XTGeoDialog
 
 xtg = XTGeoDialog()