Lint with ruff 0.5.0

docs/make_plots.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 
 import matplotlib.pyplot as plt
+
 from pyscal import GasOil, GasWater, WaterOil
 
 IMG_DIR = Path(__file__).absolute().parent / "images"

tests/test_estimateendpoints.py

@@ -3,6 +3,7 @@
 import hypothesis.strategies as st
 import numpy as np
 from hypothesis import given
+
 from pyscal import GasOil, WaterOil
 from pyscal.constants import EPSILON as epsilon
 

tests/test_factory.py

@@ -6,6 +6,7 @@
 import numpy as np
 import pandas as pd
 import pytest
+
 from pyscal import (
     GasOil,
     GasWater,

tests/test_fromtable.py

@@ -5,6 +5,7 @@
 import pandas as pd
 import pytest
 from hypothesis import given
+
 from pyscal import GasOil, WaterOil, WaterOilGas
 from pyscal.utils.testing import check_table, float_df_checker
 

tests/test_gasoil.py

@@ -10,6 +10,7 @@
 import pandas as pd
 import pytest
 from hypothesis import given
+
 from pyscal import GasOil
 from pyscal.constants import MAX_EXPONENT_KR, SWINTEGERS
 from pyscal.utils.relperm import truncate_zeroness

tests/test_gaswater.py

@@ -8,6 +8,7 @@
 import numpy as np
 import pytest
 from hypothesis import given
+
 from pyscal import GasWater
 from pyscal.constants import SWINTEGERS
 from pyscal.utils.testing import (

tests/test_interactive_plots.py

@@ -9,6 +9,7 @@
 import numpy as np
 import pytest
 from matplotlib import pyplot
+
 from pyscal import GasOil, GasWater, PyscalFactory, WaterOil, utils
 
 from .test_scalrecommendation import BASE_SAMPLE_LET, HIGH_SAMPLE_LET, LOW_SAMPLE_LET

tests/test_logging.py

@@ -2,8 +2,9 @@
 import sys
 from pathlib import Path
 
-import pyscal
 import pytest
+
+import pyscal
 from pyscal import pyscalcli
 
 

tests/test_plotting.py

@@ -4,6 +4,7 @@
 
 import matplotlib.pyplot as plt
 import pytest
+
 from pyscal import GasOil, GasWater, PyscalList, WaterOil, WaterOilGas, plotting
 
 

tests/test_pyscalcli.py

@@ -8,6 +8,7 @@
 
 import pandas as pd
 import pytest
+
 from pyscal import pyscalcli
 from pyscal.utils.testing import sat_table_str_ok
 

tests/test_pyscallist.py

@@ -5,6 +5,7 @@
 import numpy as np
 import pandas as pd
 import pytest
+
 from pyscal import (
     GasOil,
     GasWater,

tests/test_scalrecommendation.py

@@ -4,6 +4,7 @@
 import pandas as pd
 import pytest
 from hypothesis import given
+
 from pyscal import GasWater, PyscalFactory, SCALrecommendation, WaterOil, WaterOilGas
 from pyscal.factory import slicedict
 from pyscal.utils.testing import check_table, sat_table_str_ok, slow_hypothesis

tests/test_slgof.py

@@ -4,6 +4,7 @@
 import numpy as np
 import pytest
 from hypothesis import given
+
 from pyscal import GasOil, WaterOilGas
 from pyscal.constants import EPSILON, SWINTEGERS
 from pyscal.utils.testing import sat_table_str_ok

tests/test_utils_capillarypressure.py

@@ -6,6 +6,7 @@
 import numpy as np
 import pytest
 from hypothesis import given
+
 from pyscal.constants import EPSILON
 from pyscal.utils import capillarypressure
 

tests/test_utils_interpolation.py

@@ -6,6 +6,7 @@
 import pytest
 from hypothesis import given
 from matplotlib import pyplot as plt
+
 from pyscal import GasOil, WaterOil
 from pyscal.constants import EPSILON as epsilon
 from pyscal.utils.interpolation import (

tests/test_utils_monotonicity.py

@@ -5,6 +5,7 @@
 import numpy as np
 import pandas as pd
 import pytest
+
 from pyscal.utils.monotonicity import (
     check_almost_monotone,
     check_limits,

tests/test_utils_relperm.py

@@ -3,6 +3,7 @@
 import numpy as np
 import pandas as pd
 import pytest
+
 from pyscal.utils.relperm import crosspoint, estimate_diffjumppoint, truncate_zeroness
 
 # pyscal.utils.relperm.crosspoint() is also tested in test_wateroil and test_gasoil.

tests/test_utils_string.py

@@ -1,6 +1,7 @@
 """Test module for pyscal.utils"""
 
 import pandas as pd
+
 from pyscal.utils.string import comment_formatter, df2str
 
 

tests/test_utils_testing.py

@@ -4,6 +4,7 @@
 
 import pandas as pd
 import pytest
+
 from pyscal.utils.testing import float_df_checker, sat_table_str_ok
 
 

tests/test_wateroil.py

@@ -10,6 +10,7 @@
 import pandas as pd
 import pytest
 from hypothesis import given
+
 from pyscal import WaterOil
 from pyscal.constants import SWINTEGERS
 from pyscal.utils.testing import (

tests/test_wateroil_pc.py

@@ -4,6 +4,7 @@
 import numpy as np
 import pytest
 from hypothesis import given
+
 from pyscal import WaterOil
 from pyscal.constants import MAX_EXPONENT_PC
 from pyscal.utils.testing import check_table, float_df_checker, sat_table_str_ok

tests/test_wateroil_saturation.py

@@ -4,6 +4,7 @@
 
 import hypothesis.strategies as st
 from hypothesis import given
+
 from pyscal import WaterOil
 from pyscal.constants import EPSILON, SWINTEGERS
 from pyscal.utils.testing import check_table, float_df_checker

tests/test_wateroilgas.py

@@ -4,6 +4,7 @@
 from pathlib import Path
 
 import pytest
+
 from pyscal import GasOil, WaterOil, WaterOilGas
 from pyscal.utils.testing import sat_table_str_ok