BLD: Pin swig<4.3.0

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")

pyproject.toml

@@ -2,7 +2,7 @@
 requires = [
     "pybind11",
     "scikit-build-core[pyproject]",
-    "swig",
+    "swig<4.3.0",
     "numpy==1.19.2; python_version == '3.8'",
     "numpy==1.19.5; python_version == '3.9'",
     "numpy==1.21.6; python_version == '3.10'",

src/xtgeo/cube/cube1.py

@@ -101,7 +101,7 @@ def wrapper(cls, *args, **kwargs):
                 DeprecationWarning,
             )
             cfile = args[0]
-            fformat = args[1] if len(args) > 1 else kwargs.get("fformat", None)
+            fformat = args[1] if len(args) > 1 else kwargs.get("fformat")
 
             mfile = FileWrapper(cfile)
             fmt = mfile.fileformat(fformat)
@@ -1045,9 +1045,8 @@ def scan_segy_traces(sfile: str, outfile: FileLike = None):
         oflag = False
         # if outfile is none, it means that you want to plot on STDOUT
         if outfile is None:
-            fx = tempfile.NamedTemporaryFile(delete=False, prefix="tmpxgeo")
-            fx.close()
-            outfile = fx.name
+            with tempfile.NamedTemporaryFile(delete=False, prefix="tmpxgeo") as fx:
+                outfile = fx.name
             logger.info("TMP file name is %s", outfile)
             oflag = True
 
@@ -1082,9 +1081,8 @@ def scan_segy_header(sfile: str, outfile: FileLike = None):
         flag = False
         # if outfile is none, it means that you want to print on STDOUT
         if outfile is None:
-            fc = tempfile.NamedTemporaryFile(delete=False, prefix="tmpxtgeo")
-            fc.close()
-            outfile = fc.name
+            with tempfile.NamedTemporaryFile(delete=False, prefix="tmpxtgeo") as fc:
+                outfile = fc.name
             logger.info("TMP file name is %s", outfile)
             flag = True
 

src/xtgeo/grid3d/grid_property.py

@@ -248,7 +248,7 @@ def wrapper(self: GridProperty, *args: Any, **kwargs: Any) -> Callable:
                 "myprop = xtgeo.gridproperty_from_file('some_name.roff') instead",
                 DeprecationWarning,
             )
-            fformat = kwargs.get("fformat", None)
+            fformat = kwargs.get("fformat")
             mfile = FileWrapper(pfile)
             fmt = mfile.fileformat(fformat)
 

src/xtgeo/surface/regular_surface.py

@@ -285,8 +285,8 @@ def wrapper(cls, *args, **kwargs):
                 DeprecationWarning,
             )
             sfile = kwargs.get("sfile", args[0])
-            fformat = kwargs.get("fformat", None)
-            values = kwargs.get("values", None)
+            fformat = kwargs.get("fformat")
+            values = kwargs.get("values")
             if isinstance(values, bool) and values is False:
                 load_values = False
             else:
@@ -337,7 +337,7 @@ def wrapper(cls, *args, **kwargs):
                 and kwargs.get("xori", 0.0) == kwargs.get("yori", 0.0) == 0.0
                 and kwargs.get("xinc", 25.0) == kwargs.get("yinc", 25.0) == 25.0
             )
-            values = kwargs.get("values", None)
+            values = kwargs.get("values")
             if values is None and default:
                 default_values = [
                     [1, 6, 11],

src/xtgeo/well/blocked_wells.py

@@ -179,7 +179,7 @@ def from_roxar(self, *args, **kwargs):  # pragma: no cover
         project = args[0]
         gname = args[1]
         bwname = args[2]
-        lognames = kwargs.get("lognames", None)
+        lognames = kwargs.get("lognames")
         ijk = kwargs.get("ijk", True)
 
         _blockedwells_roxapi.import_bwells_roxapi(
@@ -208,7 +208,7 @@ def _from_roxar(self, *args, **kwargs):  # pragma: no cover
         project = args[0]
         gname = args[1]
         bwname = args[2]
-        lognames = kwargs.get("lognames", None)
+        lognames = kwargs.get("lognames")
         ijk = kwargs.get("ijk", True)
 
         _blockedwells_roxapi.import_bwells_roxapi(

src/xtgeo/well/well1.py

@@ -772,7 +772,7 @@ def to_roxar(self, *args, **kwargs):
         trajectory = kwargs.get("trajectory", "Drilled trajectory")
         logrun = kwargs.get("logrun", "log")
         realisation = kwargs.get("realisation", 0)
-        update_option = kwargs.get("update_option", None)
+        update_option = kwargs.get("update_option")
 
         logger.debug("Not in use: realisation %s", realisation)
 

src/xtgeo/xyz/_xyz_io.py

@@ -214,7 +214,7 @@ def to_file(
         KeyError if pfilter is set and key(s) are invalid
 
     """
-    filter_deprecated = kwargs.get("filter", None)
+    filter_deprecated = kwargs.get("filter")
     if filter_deprecated is not None and pfilter is None:
         pfilter = filter_deprecated
 

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

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

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

@@ -3,9 +3,10 @@
 
 import numpy as np
 import pytest
-import xtgeo
 from hypothesis import given
 from packaging import version
+
+import xtgeo
 from xtgeo import GridProperties, GridProperty
 from xtgeo.common.version import __version__ as xtgeo_version
 

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")