Use hypothesis profiles for settings

* Avoid deadlines altogheter in CI.
* Remove most deadlines when run locally, keep deadlines for
  selected slow tests, and mark them.

.github/workflows/codecov.yml

@@ -31,7 +31,7 @@ jobs:
 
     - name: Generate coverage report
       run: |
-        pytest tests --disable-warnings --cov=pyscal --cov-report=xml
+        pytest --hypothesis-profile ci tests --disable-warnings --cov=pyscal --cov-report=xml
 
     - name: Upload coverage to Codecov
       run: |

.github/workflows/pyscal.yml

@@ -62,7 +62,7 @@ jobs:
       - name: Run tests
         run: |
           python -c "import pyscal"
-          pytest tests/
+          pytest --strict-markers --hypothesis-profile ci tests/
 
       - name: Syntax check documentation
         run: |

setup.cfg

@@ -14,6 +14,7 @@ ignore = E741, W503, E203
 markers =
     integration: marks a test as an integration test
     plot: marks a test as interactive, plots will flash to the screen
+    slow: a test that is expected to take up to a second or so to execute
 xfail_strict=True
 
 [build_sphinx]

tests/conftest.py

@@ -4,6 +4,12 @@
 import logging
 
 import pytest
+from hypothesis import HealthCheck, settings
+
+settings.register_profile(
+    "ci", max_examples=250, deadline=None, suppress_health_check=[HealthCheck.too_slow]
+)
+settings.register_profile("slow", max_examples=50, deadline=1000)
 
 
 @pytest.fixture

tests/test_fromtable.py

@@ -4,7 +4,7 @@
 import numpy as np
 import pandas as pd
 import pytest
-from hypothesis import given, settings
+from hypothesis import given
 
 from pyscal import GasOil, WaterOil, WaterOilGas
 from pyscal.utils.testing import check_table, float_df_checker
@@ -641,7 +641,6 @@ def test_fromtable_types():
         )
 
 
-@settings(deadline=2000)
 @given(st.floats(min_value=1e-5, max_value=1))
 def test_wo_fromtable_h(h):
     """Test making curves from tabular data with random stepsize h"""

tests/test_gasoil.py

@@ -7,10 +7,10 @@
 import numpy as np
 import pandas as pd
 import pytest
-from hypothesis import given, settings
+from hypothesis import given
 
 from pyscal import GasOil
-from pyscal.constants import SWINTEGERS
+from pyscal.constants import MAX_EXPONENT, SWINTEGERS
 from pyscal.utils.relperm import truncate_zeroness
 from pyscal.utils.testing import (
     check_linear_sections,
@@ -130,7 +130,6 @@ def test_plotting(mocker):
     gasoil.plotkrgkrog(logyscale=True, mpl_ax=None)
 
 
-@settings(deadline=2000)
 @given(st.text())
 def test_gasoil_tag(tag):
     """Test tagging of GasOil objects,
@@ -143,7 +142,6 @@ def test_gasoil_tag(tag):
     sat_table_str_ok(gasoil.SGFN())
 
 
-@settings(deadline=2000)
 @given(
     st.floats(min_value=0, max_value=0.15),  # swl
     st.floats(min_value=0, max_value=0.3),  # sgcr
@@ -182,7 +180,6 @@ def test_gasoil_normalization(swl, sgcr, sorg, h, tag):
     assert float_df_checker(gasoil.table, "SG", gasoil.sgcr, "SGN", 0)
 
 
-@settings(deadline=2000)
 @given(
     st.floats(min_value=0, max_value=0.3),  # swl
     st.floats(min_value=0, max_value=0.3),  # sgcr
@@ -401,8 +398,10 @@ def test_kroend():
     assert gasoil.table["KROG"].max() == 0.5
 
 
-@settings(deadline=2000)
-@given(st.floats(), st.floats())
+@given(
+    st.floats(min_value=1e-4, max_value=MAX_EXPONENT),  # ng
+    st.floats(min_value=1e-4, max_value=MAX_EXPONENT),  # nog
+)
 def test_gasoil_corey1(ng, nog):
     """Test the Corey formulation for gasoil"""
     gasoil = GasOil()
@@ -469,7 +468,6 @@ def test_comments():
     assert "PC" in sgof
 
 
-@settings(deadline=2000)
 @given(st.floats(), st.floats(), st.floats(), st.floats(), st.floats())
 def test_gasoil_let1(l, e, t, krgend, krgmax):
     """Test the LET formulation, take 1"""

tests/test_gaswater.py

@@ -5,7 +5,7 @@
 import matplotlib.pyplot
 import numpy as np
 import pytest
-from hypothesis import given, settings
+from hypothesis import given
 
 from pyscal import GasWater
 from pyscal.constants import SWINTEGERS
@@ -79,7 +79,6 @@ def test_fast():
     assert "krw = krg" not in sgfn  # Crosspoint should not be present
 
 
-@settings(deadline=2000)
 @given(st.text())
 def test_gaswater_tag(tag):
     """Test that we are unlikely to crash Eclipse
@@ -91,7 +90,6 @@ def test_gaswater_tag(tag):
     sat_table_str_ok(gaswater.SGFN())
 
 
-@settings(deadline=2000)
 @given(st.floats(), st.floats())
 def test_gaswater_corey1(nw, ng):
     """Test random corey parameters"""
@@ -116,7 +114,6 @@ def test_gaswater_corey1(nw, ng):
     assert len(sgfnstr) > 100
 
 
-@settings(deadline=2000)
 @given(st.floats(), st.floats(), st.floats(), st.floats(), st.floats())
 def test_gaswater_let1(l, e, t, krwend, krwmax):
     """Test random LET parameters"""
@@ -140,7 +137,6 @@ def test_gaswater_let1(l, e, t, krwend, krwmax):
     assert len(sgfnstr) > 100
 
 
-@settings(deadline=2000)
 @given(
     st.floats(min_value=0, max_value=0.3),
     st.floats(min_value=0, max_value=0.3),

tests/test_scalrecommendation.py

@@ -9,6 +9,8 @@
 from pyscal.factory import slicedict
 from pyscal.utils.testing import check_table, sat_table_str_ok
 
+slow_profile = settings.get_profile("slow")
+
 # Example SCAL recommendation, low case
 LOW_SAMPLE_LET = {
     "swirr": 0.1,
@@ -206,7 +208,8 @@ def test_make_scalrecommendation_go():
         rec.interpolate(2)
 
 
-@settings(max_examples=10, deadline=2000)
+@pytest.mark.slow
+@settings(deadline=slow_profile.deadline)
 @given(
     st.floats(min_value=-1.1, max_value=1.1), st.floats(min_value=-1.1, max_value=1.1)
 )

tests/test_slgof.py

@@ -3,7 +3,7 @@
 import hypothesis.strategies as st
 import numpy as np
 import pytest
-from hypothesis import given, settings
+from hypothesis import given
 
 from pyscal import GasOil, WaterOilGas
 from pyscal.constants import EPSILON, SWINTEGERS
@@ -24,7 +24,6 @@ def check_table(dframe):
         assert dframe["PC"].is_monotonic_decreasing
 
 
-@settings(deadline=2000)
 @given(
     st.floats(min_value=0.0, max_value=0.3),
     st.floats(min_value=0.0, max_value=0.3),
@@ -125,7 +124,6 @@ def test_numerical_problems(swl, sorg, sgcr):
     check_table(slgof)
 
 
-@settings(deadline=2000)  # This is slow for small h
 @given(
     st.floats(min_value=0.0, max_value=0.3),
     st.floats(min_value=0.0, max_value=0.3),
@@ -150,7 +148,6 @@ def test_slgof_hypo(swl, sorg, sgcr, h):
     sat_table_str_ok(slgof_str)
 
 
-@settings(deadline=2000)
 @given(
     st.floats(min_value=0.0, max_value=0.3),
     st.floats(min_value=0.0, max_value=0.3),

tests/test_utils_interpolation.py

@@ -18,8 +18,11 @@
 )
 from pyscal.utils.testing import check_table, float_df_checker, sat_table_str_ok
 
+slow_profile = settings.get_profile("slow")
 
-@settings(deadline=1000)
+
+@pytest.mark.slow
+@settings(deadline=slow_profile.deadline)
 @given(
     st.floats(min_value=0, max_value=0.1),  # swl
     st.floats(min_value=0, max_value=0.0),  # dswcr
@@ -239,7 +242,8 @@ def test_tag_preservation():
     sat_table_str_ok(interpolant1.SGOF())
 
 
-@settings(max_examples=40, deadline=5000)
+@pytest.mark.slow
+@settings(max_examples=slow_profile.max_examples, deadline=slow_profile.deadline)
 @given(
     st.floats(min_value=0.01, max_value=0.1),  # swl
     st.floats(min_value=0, max_value=0.0),  # dswcr
@@ -338,7 +342,8 @@ def test_interpolate_wo(
     # trigger a discontinuity in the interpolants, which we don't want.
 
 
-@settings(max_examples=40, deadline=5000)
+@pytest.mark.slow
+@settings(max_examples=slow_profile.max_examples, deadline=slow_profile.deadline)
 @given(
     st.floats(min_value=0.01, max_value=0.1),  # swl
     st.floats(min_value=0, max_value=0.0),  # dswcr
@@ -409,7 +414,8 @@ def test_interpolate_wo_pc(swl, dswcr, dswlhigh, sorw, a_l, a_h, b_l, b_h):
     # trigger a discontinuity in the interpolants, which we don't want.
 
 
-@settings(max_examples=40, deadline=2000)
+@pytest.mark.slow
+@settings(deadline=slow_profile.deadline)
 @given(
     st.floats(min_value=0, max_value=0.1),  # swl
     st.floats(min_value=0, max_value=0.1),  # sgcr
@@ -671,7 +677,8 @@ def test_ip_go_kroend():
     assert float_df_checker(go_ip.table, "SG", 1 - 0.01 - 0.15, "KROG", 0)
 
 
-@settings(max_examples=50, deadline=5000)
+@pytest.mark.slow
+@settings(max_examples=slow_profile.max_examples, deadline=slow_profile.deadline)
 @given(
     st.floats(min_value=0, max_value=0.1),  # swl
     st.floats(min_value=0, max_value=0.1),  # sgcr

tests/test_wateroil.py

@@ -7,7 +7,7 @@
 import numpy as np
 import pandas as pd
 import pytest
-from hypothesis import given, settings
+from hypothesis import given
 
 from pyscal import WaterOil
 from pyscal.constants import SWINTEGERS
@@ -43,7 +43,6 @@ def check_endpoints(wateroil, krwend, krwmax, kroend):
         assert np.isclose(wateroil.table["KRW"].max(), krwend)
 
 
-@settings(deadline=2000)
 @given(st.text())
 def test_wateroil_tag(tag):
     """Test that we are unlikely to crash Eclipse
@@ -55,7 +54,6 @@ def test_wateroil_tag(tag):
     sat_table_str_ok(wateroil.SWFN())
 
 
-@settings(deadline=2000)
 @given(st.floats(), st.floats())
 def test_wateroil_corey1(nw, now):
     """Test random corey parameters"""
@@ -76,7 +74,6 @@ def test_wateroil_corey1(nw, now):
     assert len(swofstr) > 100
 
 
-@settings(deadline=2000)
 @given(st.floats(), st.floats(), st.floats(), st.floats(), st.floats())
 def test_wateroil_let1(l, e, t, krwend, krwmax):
     """Test random LET parameters"""
@@ -96,7 +93,6 @@ def test_wateroil_let1(l, e, t, krwend, krwmax):
     assert len(swofstr) > 100
 
 
-@settings(deadline=2000)
 @given(
     st.floats(min_value=0, max_value=0.4),
     st.floats(min_value=0, max_value=0.4),

tests/test_wateroil_pc.py

@@ -3,7 +3,7 @@
 import hypothesis.strategies as st
 import numpy as np
 import pytest
-from hypothesis import given, settings
+from hypothesis import given
 
 from pyscal import WaterOil
 from pyscal.constants import MAX_EXPONENT
@@ -84,7 +84,6 @@ def test_simple_j_petro():
         wateroil.add_simple_J_petro(a=1, b=2)
 
 
-@settings(deadline=2000)
 @given(
     st.floats(min_value=0.001, max_value=1000000),
     st.floats(min_value=-0.9 * MAX_EXPONENT, max_value=-0.001),
@@ -139,7 +138,6 @@ def test_normalized_j(caplog):
     assert "a parameter is very high" in caplog.text
 
 
-@settings(deadline=2000)
 @given(
     st.floats(min_value=0, max_value=0.1),  # swirr
     st.floats(min_value=0.01, max_value=0.1),  # swl - swirr

tests/test_wateroil_saturation.py

@@ -1,14 +1,13 @@
 """Test module for the saturation ranges in WaterOil objects"""
 
 import hypothesis.strategies as st
-from hypothesis import given, settings
+from hypothesis import given
 
 from pyscal import WaterOil
 from pyscal.constants import EPSILON, SWINTEGERS
 from pyscal.utils.testing import check_table, float_df_checker
 
 
-@settings(deadline=2000)
 @given(
     st.floats(),
     st.floats(),
@@ -27,7 +26,6 @@ def test_wateroil_random(swirr, swl, swcr, sorw, socr, h, tag):
         pass
 
 
-@settings(deadline=2000)
 @given(
     st.floats(min_value=0, max_value=0.1),
     st.floats(min_value=0, max_value=0.15),
@@ -69,7 +67,6 @@ def test_wateroil_normalization(swirr, swl, swcr, sorw, socr_add, h, tag):
     assert float_df_checker(wateroil.table, "SW", 1.0, "SWNPC", 1)
 
 
-@settings(deadline=2000)
 @given(st.floats(min_value=0, max_value=1 - EPSILON))
 def test_wateroil_swir(swirr):
     """Check that the saturation values are valid for all swirr"""
@@ -105,7 +102,6 @@ def test_wateroil_socr(socr):
     check_table(wateroil.table)
 
 
-@settings(deadline=2000)
 @given(st.floats(min_value=0, max_value=1), st.floats(min_value=0, max_value=1))
 def test_wateroil_dual(param1, param2):
     """Test combination of 2 floats as parameters"""