pytest-lazy-fixture removal

pytest-lazy-fixture is incompatible with python3.7+
pbs · Jan 29, 2024 · 3adcc33 · 3adcc33
1 parent 4b95ab2
commit 3adcc33
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 35 deletions.
diff --git a/setup.py b/setup.py
@@ -14,8 +14,7 @@
 ]
 
 dev_dependencies = [
-    'pytest',
-    'pytest-lazy-fixture'
+    'pytest'
 ]
 
 transcript_dependencies = [

diff --git a/test_requirements.txt b/test_requirements.txt
@@ -1,6 +1,5 @@
 pytest
 pytest-cov
-pytest-lazy-fixture
 beautifulsoup4>=4.12.1
 lxml>=4.9.1
 cssutils>=2.0.0
diff --git a/tests/fixtures/dfxp.py b/tests/fixtures/dfxp.py
@@ -3,6 +3,10 @@
 
 @pytest.fixture(scope="session")
 def sample_dfxp():
+    return sample_dfxp_base()
+
+
+def sample_dfxp_base():
     return """\
 <?xml version="1.0" encoding="utf-8"?>
 <tt xml:lang="en" xmlns="http://www.w3.org/ns/ttml"

diff --git a/tests/fixtures/microdvd.py b/tests/fixtures/microdvd.py
@@ -3,6 +3,10 @@
 
 @pytest.fixture(scope="session")
 def sample_microdvd():
+    return sample_microdvd_base()
+
+
+def sample_microdvd_base():
     return """{230}{307}( clock ticking )
 {371}{425}MAN:|When we think|\u266a ...say bow, wow, \u266a
 {425}{468}we have this vision of Einstein

diff --git a/tests/fixtures/sami.py b/tests/fixtures/sami.py
@@ -3,6 +3,10 @@
 
 @pytest.fixture(scope="session")
 def sample_sami():
+    return sample_sami_base()
+
+
+def sample_sami_base():
     return """
 <SAMI><HEAD><TITLE>NOVA3213</TITLE><STYLE TYPE="text/css">
 <!--

diff --git a/tests/fixtures/scc.py b/tests/fixtures/scc.py
@@ -48,6 +48,10 @@ def sample_scc_produces_captions_with_start_and_end_time_the_same():
 
 @pytest.fixture(scope="session")
 def sample_scc_pop_on():
+    return sample_scc_pop_on_base()
+
+
+def sample_scc_pop_on_base():
     return """Scenarist_SCC V1.0
 
 00:00:09:05 94ae 94ae 9420 9420 9470 9470 a820 e3ec efe3 6b20 f4e9 e36b e96e 6720 2980 942c 942c 942f 942f

diff --git a/tests/fixtures/srt.py b/tests/fixtures/srt.py
@@ -3,6 +3,10 @@
 
 @pytest.fixture(scope="session")
 def sample_srt():
+    return sample_srt_base()
+
+
+def sample_srt_base():
     return """1
 00:00:09,209 --> 00:00:12,312
 ( clock ticking )

diff --git a/tests/fixtures/webvtt.py b/tests/fixtures/webvtt.py
@@ -3,6 +3,10 @@
 
 @pytest.fixture(scope="session")
 def sample_webvtt():
+    return sample_webvtt_base()
+
+
+def sample_webvtt_base():
     return """WEBVTT
 
 00:09.209 --> 00:12.312

diff --git a/tests/test_dfxp.py b/tests/test_dfxp.py
@@ -9,7 +9,11 @@
     UnitEnum, HorizontalAlignmentEnum, VerticalAlignmentEnum,
 )
 from tests.mixins import ReaderTestingMixIn
-from pytest_lazyfixture import lazy_fixture
+from tests.fixtures.microdvd import sample_microdvd_base
+from tests.fixtures.sami import sample_sami_base
+from tests.fixtures.scc import sample_scc_pop_on_base
+from tests.fixtures.srt import sample_srt_base
+from tests.fixtures.webvtt import sample_webvtt_base
 
 
 class TestDFXPReader(ReaderTestingMixIn):
@@ -20,11 +24,11 @@ def test_positive_answer_for_detection(self, sample_dfxp):
         super().assert_positive_answer_for_detection(sample_dfxp)
 
     @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_microdvd'),
-        pytest.lazy_fixture('sample_sami'),
-        pytest.lazy_fixture('sample_scc_pop_on'),
-        pytest.lazy_fixture('sample_srt'),
-        pytest.lazy_fixture('sample_webvtt')
+        sample_microdvd_base(),
+        sample_sami_base(),
+        sample_scc_pop_on_base(),
+        sample_srt_base(),
+        sample_webvtt_base()
     ])
     def test_negative_answer_for_detection(self, different_sample):
         super().assert_negative_answer_for_detection(different_sample)
@@ -103,7 +107,7 @@ def test_caption_error_for_invalid_positioning_values(
             self, sample_dfxp_invalid_positioning_value_template):
         invalid_value_dfxp = (
             sample_dfxp_invalid_positioning_value_template.
-                format(origin="px 5px")
+            format(origin="px 5px")
         )
         with pytest.raises(CaptionReadSyntaxError):
             DFXPReader().read(invalid_value_dfxp)

diff --git a/tests/test_microdvd.py b/tests/test_microdvd.py
@@ -3,6 +3,11 @@
 from pycaption import MicroDVDReader, CaptionReadNoCaptions
 from pycaption.exceptions import CaptionReadSyntaxError, CaptionReadTimingError
 from pycaption.base import DEFAULT_LANGUAGE_CODE
+from tests.fixtures.dfxp import sample_dfxp_base
+from tests.fixtures.sami import sample_sami_base
+from tests.fixtures.scc import sample_scc_pop_on_base
+from tests.fixtures.srt import sample_srt_base
+from tests.fixtures.webvtt import sample_webvtt_base
 from tests.mixins import ReaderTestingMixIn
 
 
@@ -14,11 +19,11 @@ def test_positive_answer_for_detection(self, sample_microdvd):
         super().assert_positive_answer_for_detection(sample_microdvd)
 
     @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_dfxp'),
-        pytest.lazy_fixture('sample_sami'),
-        pytest.lazy_fixture('sample_scc_pop_on'),
-        pytest.lazy_fixture('sample_srt'),
-        pytest.lazy_fixture('sample_webvtt')
+        sample_dfxp_base(),
+        sample_sami_base(),
+        sample_scc_pop_on_base(),
+        sample_srt_base(),
+        sample_webvtt_base()
     ])
     def test_negative_answer_for_detection(self, different_sample):
         super().assert_negative_answer_for_detection(different_sample)

diff --git a/tests/test_sami.py b/tests/test_sami.py
@@ -5,6 +5,11 @@
 from pycaption import SAMIReader, CaptionReadNoCaptions, CaptionReadSyntaxError
 from pycaption.exceptions import CaptionReadTimingError
 from pycaption.geometry import HorizontalAlignmentEnum, Size, UnitEnum  # noqa
+from tests.fixtures.dfxp import sample_dfxp_base
+from tests.fixtures.microdvd import sample_microdvd_base
+from tests.fixtures.scc import sample_scc_pop_on_base
+from tests.fixtures.srt import sample_srt_base
+from tests.fixtures.webvtt import sample_webvtt_base
 from tests.mixins import ReaderTestingMixIn
 
 
@@ -16,11 +21,11 @@ def test_positive_answer_for_detection(self, sample_sami):
         super().assert_positive_answer_for_detection(sample_sami)
 
     @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_dfxp'),
-        pytest.lazy_fixture('sample_microdvd'),
-        pytest.lazy_fixture('sample_scc_pop_on'),
-        pytest.lazy_fixture('sample_srt'),
-        pytest.lazy_fixture('sample_webvtt')
+        sample_dfxp_base(),
+        sample_microdvd_base(),
+        sample_scc_pop_on_base(),
+        sample_srt_base(),
+        sample_webvtt_base()
     ])
     def test_negative_answer_for_detection(self, different_sample):
         super().assert_negative_answer_for_detection(different_sample)

diff --git a/tests/test_scc.py b/tests/test_scc.py
@@ -10,6 +10,11 @@
     InstructionNodeCreator, TimingCorrectingCaptionList,
 )
 from pycaption.scc.state_machines import DefaultProvidingPositionTracker
+from tests.fixtures.dfxp import sample_dfxp_base
+from tests.fixtures.microdvd import sample_microdvd_base
+from tests.fixtures.sami import sample_sami_base
+from tests.fixtures.srt import sample_srt_base
+from tests.fixtures.webvtt import sample_webvtt_base
 from tests.mixins import ReaderTestingMixIn
 
 TOLERANCE_MICROSECONDS = 500 * 1000
@@ -23,11 +28,11 @@ def test_positive_answer_for_detection(self, sample_scc_pop_on):
         super().assert_positive_answer_for_detection(sample_scc_pop_on)
 
     @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_dfxp'),
-        pytest.lazy_fixture('sample_microdvd'),
-        pytest.lazy_fixture('sample_sami'),
-        pytest.lazy_fixture('sample_srt'),
-        pytest.lazy_fixture('sample_webvtt')
+        sample_dfxp_base(),
+        sample_microdvd_base(),
+        sample_sami_base(),
+        sample_srt_base(),
+        sample_webvtt_base()
     ])
     def test_negative_answer_for_detection(self, different_sample):
         super().assert_negative_answer_for_detection(different_sample)

diff --git a/tests/test_srt.py b/tests/test_srt.py
@@ -1,6 +1,11 @@
 import pytest
 
 from pycaption import SRTReader, CaptionReadNoCaptions
+from tests.fixtures.dfxp import sample_dfxp_base
+from tests.fixtures.microdvd import sample_microdvd_base
+from tests.fixtures.sami import sample_sami_base
+from tests.fixtures.scc import sample_scc_pop_on_base
+from tests.fixtures.webvtt import sample_webvtt_base
 from tests.mixins import ReaderTestingMixIn
 
 
@@ -12,11 +17,11 @@ def test_positive_answer_for_detection(self, sample_srt):
         super().assert_positive_answer_for_detection(sample_srt)
 
     @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_dfxp'),
-        pytest.lazy_fixture('sample_microdvd'),
-        pytest.lazy_fixture('sample_sami'),
-        pytest.lazy_fixture('sample_scc_pop_on'),
-        pytest.lazy_fixture('sample_webvtt')
+        sample_dfxp_base(),
+        sample_microdvd_base(),
+        sample_sami_base(),
+        sample_scc_pop_on_base(),
+        sample_webvtt_base()
     ])
     def test_negative_answer_for_detection(self, different_sample):
         super().assert_negative_answer_for_detection(different_sample)

diff --git a/tests/test_webvtt.py b/tests/test_webvtt.py
@@ -4,6 +4,11 @@
     WebVTTReader, WebVTTWriter, SAMIReader, DFXPReader,
     CaptionReadNoCaptions, CaptionReadError, CaptionReadSyntaxError,
 )
+from tests.fixtures.dfxp import sample_dfxp_base
+from tests.fixtures.microdvd import sample_microdvd_base
+from tests.fixtures.sami import sample_sami_base
+from tests.fixtures.scc import sample_scc_pop_on_base
+from tests.fixtures.srt import sample_srt_base
 from tests.mixins import ReaderTestingMixIn
 
 
@@ -15,11 +20,11 @@ def test_positive_answer_for_detection(self, sample_webvtt):
         super().assert_positive_answer_for_detection(sample_webvtt)
 
     @pytest.mark.parametrize('different_sample', [
-        pytest.lazy_fixture('sample_dfxp'),
-        pytest.lazy_fixture('sample_microdvd'),
-        pytest.lazy_fixture('sample_sami'),
-        pytest.lazy_fixture('sample_scc_pop_on'),
-        pytest.lazy_fixture('sample_srt')
+        sample_dfxp_base(),
+        sample_microdvd_base(),
+        sample_sami_base(),
+        sample_scc_pop_on_base(),
+        sample_srt_base()
     ])
     def test_negative_answer_for_detection(self, different_sample):
         super().assert_negative_answer_for_detection(different_sample)