CLN: Lint with isort

src/xtgeo/common/__init__.py

@@ -2,12 +2,8 @@
 """The XTGeo common package"""
 
 
-# flake8: noqa
-from xtgeo.common.xtgeo_dialog import XTGeoDialog
-from xtgeo.common.xtgeo_dialog import XTGDescription
-from xtgeo.common.xtgeo_dialog import XTGShowProgress
-
-from xtgeo.common.sys import _XTGeoFile
-from xtgeo.common.sys import inherit_docstring
-
 from xtgeo.common.exceptions import WellNotFoundError
+from xtgeo.common.sys import _XTGeoFile, inherit_docstring
+
+# flake8: noqa
+from xtgeo.common.xtgeo_dialog import XTGDescription, XTGeoDialog, XTGShowProgress

src/xtgeo/cube/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
 """The XTGeo cube package."""
 
-from xtgeo.cube.cube1 import Cube  # type: ignore # noqa # pylint: disable=undefined-variable
+from xtgeo.cube.cube1 import (  # type: ignore # noqa # pylint: disable=undefined-variable
+    Cube,
+)

src/xtgeo/cube/_cube_export.py

@@ -1,15 +1,15 @@
 """Export Cube data via SegyIO library or XTGeo CLIB."""
+import json
 import shutil
 import struct
-import json
-import numpy as np
 
+import numpy as np
 import segyio
 
 import xtgeo
 import xtgeo.cxtgeo._cxtgeo as _cxtgeo
-from xtgeo.common import XTGeoDialog
 from xtgeo import XTGeoCLibError
+from xtgeo.common import XTGeoDialog
 
 xtg = XTGeoDialog()
 

src/xtgeo/grid3d/__init__.py

@@ -11,5 +11,5 @@
 
 from ._ecl_grid import GridRelative, Units
 from .grid import Grid
-from .grid_property import GridProperty
 from .grid_properties import GridProperties
+from .grid_property import GridProperty

src/xtgeo/grid3d/_grid3d_fence.py

@@ -4,9 +4,9 @@
 import numpy as np
 
 import xtgeo
+import xtgeo.cxtgeo._cxtgeo as _cxtgeo
 from xtgeo.grid3d import _gridprop_lowlevel as gl
 from xtgeo.surface import _regsurf_lowlevel as rl
-import xtgeo.cxtgeo._cxtgeo as _cxtgeo
 
 xtg = xtgeo.common.XTGeoDialog()
 logger = xtg.functionlogger(__name__)

src/xtgeo/grid3d/_grid_etc1.py

@@ -2,13 +2,14 @@
 
 from collections import OrderedDict
 from copy import deepcopy
-from packaging.version import parse as versionparse
 from math import atan2, degrees
 from typing import Tuple
 
 import numpy as np
 import numpy.ma as ma
 import pandas as pd
+from packaging.version import parse as versionparse
+
 import xtgeo
 import xtgeo.cxtgeo._cxtgeo as _cxtgeo
 from xtgeo.common import XTGeoDialog

src/xtgeo/grid3d/_grid_refine.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 """Private module for refinement of a grid."""
 from collections import OrderedDict
+
 import numpy as np
 
-from xtgeo.common import XTGeoDialog
 import xtgeo.cxtgeo._cxtgeo as _cxtgeo
+from xtgeo.common import XTGeoDialog
 
 xtg = XTGeoDialog()
 

src/xtgeo/grid3d/_grid_wellzone.py

@@ -1,6 +1,7 @@
 """Private module for grid vs well zonelog checks."""
 
 import numpy as np
+
 import xtgeo
 
 xtg = xtgeo.common.XTGeoDialog()

src/xtgeo/grid3d/_gridprop_import_roff.py

@@ -4,6 +4,7 @@
 import warnings
 
 import numpy as np
+
 import xtgeo
 
 from ._roff_parameter import RoffParameter

src/xtgeo/grid3d/_gridprop_op1.py

@@ -4,9 +4,9 @@
 import numpy as np
 
 import xtgeo
+import xtgeo.cxtgeo._cxtgeo as _cxtgeo
 from xtgeo.common import XTGeoDialog
 from xtgeo.grid3d import _gridprop_lowlevel as gl
-import xtgeo.cxtgeo._cxtgeo as _cxtgeo
 
 xtg = XTGeoDialog()
 

src/xtgeo/grid3d/_gridprops_import_eclrun.py

@@ -1,8 +1,9 @@
 from copy import deepcopy
 from typing import List, Tuple, Union
 
-import xtgeo
 from typing_extensions import Literal
+
+import xtgeo
 from xtgeo.common.constants import MAXKEYWORDS
 
 from . import _grid3d_utils as utils

src/xtgeo/metadata/__init__.py

@@ -2,5 +2,4 @@
 # flake8: noqa
 """XTGeo metadata package."""
 
-from xtgeo.metadata.metadata import MetaDataRegularSurface
-from xtgeo.metadata.metadata import MetaDataRegularCube
+from xtgeo.metadata.metadata import MetaDataRegularCube, MetaDataRegularSurface

src/xtgeo/plot/__init__.py

@@ -2,9 +2,10 @@
 """The XTGeo plot package"""
 
 
+from xtgeo.plot.grid3d_slice import Grid3DSlice
+
 # flake8: noqa
 from xtgeo.plot.xsection import XSection
 from xtgeo.plot.xtmap import Map
-from xtgeo.plot.grid3d_slice import Grid3DSlice
 
 # from ._colortables import random, random40, xtgeocolors, colorsfromfile

src/xtgeo/plot/xtmap.py

@@ -1,13 +1,14 @@
 """Module for map plots of surfaces, using matplotlib."""
 
 
-import matplotlib.pyplot as plt
 import matplotlib.patches as mplp
-from matplotlib import ticker
+import matplotlib.pyplot as plt
 import numpy as np
 import numpy.ma as ma
+from matplotlib import ticker
 
 from xtgeo.common import XTGeoDialog
+
 from .baseplot import BasePlot
 
 xtg = XTGeoDialog()

src/xtgeo/surface/_regsurf_cube_window_v2.py

@@ -3,6 +3,7 @@
 
 
 import numpy as np
+
 import xtgeo
 import xtgeo.cxtgeo._cxtgeo as _cxtgeo
 from xtgeo.common import XTGeoDialog

src/xtgeo/surface/_regsurf_import.py

@@ -8,6 +8,7 @@
 import h5py
 import numpy as np
 import numpy.ma as ma
+
 import xtgeo
 import xtgeo.common.sys as xsys
 import xtgeo.cxtgeo._cxtgeo as _cxtgeo  # pylint: disable=no-name-in-module

src/xtgeo/well/__init__.py

@@ -2,9 +2,9 @@
 """The XTGeo well package"""
 
 
+from .blocked_well import BlockedWell
+from .blocked_wells import BlockedWells
+
 # flake8: noqa
 from .well1 import Well
 from .wells import Wells
-
-from .blocked_well import BlockedWell
-from .blocked_wells import BlockedWells

src/xtgeo/well/_blockedwell_roxapi.py

@@ -9,8 +9,8 @@
 import pandas as pd
 
 from xtgeo.common import XTGeoDialog
-from xtgeo.roxutils import RoxUtils
 from xtgeo.common.exceptions import WellNotFoundError
+from xtgeo.roxutils import RoxUtils
 
 try:
     import roxar

src/xtgeo/well/_blockedwells_roxapi.py

@@ -4,6 +4,7 @@
 
 from xtgeo.common import XTGeoDialog
 from xtgeo.roxutils import RoxUtils
+
 from .blocked_well import BlockedWell
 
 xtg = XTGeoDialog()

src/xtgeo/well/_wellmarkers.py

@@ -3,13 +3,14 @@
 
 
 from collections import OrderedDict
+
 import numpy as np
 import pandas as pd
 
 import xtgeo
+import xtgeo.common.constants as const
 import xtgeo.cxtgeo._cxtgeo as _cxtgeo
 from xtgeo.common import XTGeoDialog
-import xtgeo.common.constants as const
 
 xtg = XTGeoDialog()
 logger = xtg.functionlogger(__name__)

src/xtgeo/well/_wells_utils.py

@@ -3,12 +3,12 @@
 
 
 import logging
+
 import numpy as np
 import pandas as pd
 import shapely.geometry as sg
 
-from xtgeo.common import XTGeoDialog
-from xtgeo.common import XTGShowProgress
+from xtgeo.common import XTGeoDialog, XTGShowProgress
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())

src/xtgeo/xyz/_xyz_lowlevel.py

@@ -3,8 +3,9 @@
 
 
 import numpy as np
-from xtgeo.common import XTGeoDialog
+
 import xtgeo.cxtgeo._cxtgeo as _cxtgeo
+from xtgeo.common import XTGeoDialog
 
 xtg = XTGeoDialog()
 

tests/conftest.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 """Conftest functions"""
-from packaging.version import parse as versionparse
-
 import pandas as pd
 import pytest
+from packaging.version import parse as versionparse
 
 
 class Helpers:

tests/test_common/test_calc.py

@@ -4,6 +4,7 @@
 
 import numpy as np
 import pytest
+
 import xtgeo
 import xtgeo.common.calc as xcalc
 import xtgeo.cxtgeo._cxtgeo as _cxtgeo

tests/test_cube/test_cube.py

@@ -5,8 +5,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_deprecations.py

@@ -1,4 +1,5 @@
 import pytest
+
 import xtgeo
 
 

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_grid3d/eclrun_fixtures.py

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

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_eclrun.py

@@ -3,6 +3,7 @@
 
 import numpy as np
 import pytest
+
 import xtgeo
 
 # pylint: disable=wildcard-import, unused-wildcard-import

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

@@ -6,6 +6,7 @@
 import io
 
 import numpy as np
+
 import xtgeo
 from xtgeo.common import XTGeoDialog
 

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 hypothesis.strategies as st
 import numpy as np
 import pytest
+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_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_property_grdecl.py

@@ -4,9 +4,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_vs_points.py

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