Skip to content
Snippets Groups Projects
Commit 8f87c75c authored by David Schäfer's avatar David Schäfer
Browse files

remove incompatable and unmaintaine dependency lazy-fixture

parent 53febc74
No related branches found
No related tags found
1 merge request!820Bump pytest from 7.4.4 to 8.0.2
Pipeline #204055 failed with stages
in 1 minute and 10 seconds
This commit is part of merge request !820. Comments created here will be created in the context of that merge request.
...@@ -243,11 +243,10 @@ def test_flagManual(data, field): ...@@ -243,11 +243,10 @@ def test_flagManual(data, field):
assert ~unflagged.all() assert ~unflagged.all()
@pytest.mark.parametrize("dat", [pytest.lazy_fixture("course_1")]) def test_flagDriftFromNorm(course_1):
def test_flagDriftFromNorm(dat): data = course_1(periods=200, peak_level=5, name="field1")[0]
data = dat(periods=200, peak_level=5, name="field1")[0] data["field2"] = course_1(periods=200, peak_level=10, name="field2")[0]["field2"]
data["field2"] = dat(periods=200, peak_level=10, name="field2")[0]["field2"] data["field3"] = course_1(periods=200, peak_level=100, name="field3")[0]["field3"]
data["field3"] = dat(periods=200, peak_level=100, name="field3")[0]["field3"]
fields = ["field1", "field2", "field3"] fields = ["field1", "field2", "field3"]
...@@ -261,11 +260,10 @@ def test_flagDriftFromNorm(dat): ...@@ -261,11 +260,10 @@ def test_flagDriftFromNorm(dat):
assert all(qc._flags["field3"] > UNFLAGGED) assert all(qc._flags["field3"] > UNFLAGGED)
@pytest.mark.parametrize("dat", [pytest.lazy_fixture("course_1")]) def test_flagDriftFromReference(course_1):
def test_flagDriftFromReference(dat): data = course_1(periods=200, peak_level=5, name="field1")[0]
data = dat(periods=200, peak_level=5, name="field1")[0] data["field2"] = course_1(periods=200, peak_level=10, name="field2")[0]["field2"]
data["field2"] = dat(periods=200, peak_level=10, name="field2")[0]["field2"] data["field3"] = course_1(periods=200, peak_level=100, name="field3")[0]["field3"]
data["field3"] = dat(periods=200, peak_level=100, name="field3")[0]["field3"]
fields = ["field1", "field2", "field3"] fields = ["field1", "field2", "field3"]
......
...@@ -54,16 +54,10 @@ def test_flagSpikesBasic(spiky_data): ...@@ -54,16 +54,10 @@ def test_flagSpikesBasic(spiky_data):
@pytest.mark.slow @pytest.mark.slow
@pytest.mark.parametrize( @pytest.mark.parametrize(
"dat", "dat", ["course_1", "course_2", "course_3", "course_4"]
[
# see test/functs/fixtures.py for the 'course_N'
pytest.lazy_fixture("course_1"),
pytest.lazy_fixture("course_2"),
pytest.lazy_fixture("course_3"),
pytest.lazy_fixture("course_4"),
],
) )
def test_flagSpikesLimitRaise(dat): def test_flagSpikesLimitRaise(dat, request):
dat = request.getfixturevalue(dat)
data, characteristics = dat() data, characteristics = dat()
field, *_ = data.columns field, *_ = data.columns
flags = initFlagsLike(data) flags = initFlagsLike(data)
...@@ -80,8 +74,7 @@ def test_flagSpikesLimitRaise(dat): ...@@ -80,8 +74,7 @@ def test_flagSpikesLimitRaise(dat):
# see test/functs/fixtures.py for the 'course_N' # see test/functs/fixtures.py for the 'course_N'
@pytest.mark.parametrize("dat", [pytest.lazy_fixture("course_3")]) def test_flagMVScores(course_3):
def test_flagMVScores(dat):
def _check(fields, flags, characteristics): def _check(fields, flags, characteristics):
for field in fields: for field in fields:
isflagged = flags[field] > UNFLAGGED isflagged = flags[field] > UNFLAGGED
...@@ -89,10 +82,10 @@ def test_flagMVScores(dat): ...@@ -89,10 +82,10 @@ def test_flagMVScores(dat):
assert not isflagged[characteristics["return"]].any() assert not isflagged[characteristics["return"]].any()
assert not isflagged[characteristics["drop"]].any() assert not isflagged[characteristics["drop"]].any()
data1, characteristics = dat( data1, characteristics = course_3(
periods=1000, initial_level=5, final_level=15, out_val=50 periods=1000, initial_level=5, final_level=15, out_val=50
) )
data2, characteristics = dat( data2, characteristics = course_3(
periods=1000, initial_level=20, final_level=1, out_val=30 periods=1000, initial_level=20, final_level=1, out_val=30
) )
fields = ["field1", "field2"] fields = ["field1", "field2"]
...@@ -111,9 +104,8 @@ def test_flagMVScores(dat): ...@@ -111,9 +104,8 @@ def test_flagMVScores(dat):
_check(fields, qc.flags, characteristics) _check(fields, qc.flags, characteristics)
@pytest.mark.parametrize("dat", [pytest.lazy_fixture("course_3")]) def test_grubbs(course_3):
def test_grubbs(dat): data, char_dict = course_3(
data, char_dict = dat(
freq="10min", freq="10min",
periods=45, periods=45,
initial_level=0, initial_level=0,
...@@ -127,12 +119,11 @@ def test_grubbs(dat): ...@@ -127,12 +119,11 @@ def test_grubbs(dat):
assert np.all(qc.flags["data"][char_dict["drop"]] > UNFLAGGED) assert np.all(qc.flags["data"][char_dict["drop"]] > UNFLAGGED)
@pytest.mark.parametrize("dat", [pytest.lazy_fixture("course_2")])
@pytest.mark.parametrize( @pytest.mark.parametrize(
"parameters", "parameters",
[("standard", 1), ("modified", 1), ("modified", 3), ("standard", "3h")], [("standard", 1), ("modified", 1), ("modified", 3), ("standard", "3h")],
) )
def test_flagCrossStatistics(dat, parameters): def test_flagCrossStatistics(parameters):
fields = [f"data{i}" for i in range(6)] fields = [f"data{i}" for i in range(6)]
data = pd.DataFrame( data = pd.DataFrame(
0, columns=fields, index=pd.date_range("2000", freq="1h", periods=10) 0, columns=fields, index=pd.date_range("2000", freq="1h", periods=10)
......
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
beautifulsoup4==4.12.2 beautifulsoup4==4.12.3
hypothesis==6.92.2 hypothesis==6.98.15
Markdown==3.5.1 Markdown==3.5.2
pytest==8.0.2 pytest==8.0.2
pytest-lazy-fixture==0.6.3
requests==2.31.0 requests==2.31.0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment