Merge pull request #279 from hugovk/replace-pytest-lazy-fixture

jazzband · Feb 3, 2024 · 02385cc · 02385cc
2 parents 098fe3b + 35d5375
commit 02385cc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -35,11 +35,9 @@ dependencies = [
 ]
 [project.optional-dependencies]
 tests = [
-  # Temporarily pin pytest due to
-  # https://github.com/TvoroG/pytest-lazy-fixture/issues/65
-  "pytest<8",
+  "pytest",
   "pytest-cov",
-  "pytest-lazy-fixture",
+  "pytest-lazy-fixtures",
 ]
 [project.urls]
 Changelog = "https://github.com/jazzband/prettytable/releases"

diff --git a/tests/test_prettytable.py b/tests/test_prettytable.py
@@ -8,6 +8,7 @@
 from typing import Any
 
 import pytest
+from pytest_lazy_fixtures import lf
 
 import prettytable
 from prettytable import (
@@ -224,12 +225,12 @@ class TestBuildEquivalence:
         ["left_hand", "right_hand"],
         [
             (
-                pytest.lazy_fixture("row_prettytable"),
-                pytest.lazy_fixture("col_prettytable"),
+                lf("row_prettytable"),
+                lf("col_prettytable"),
             ),
             (
-                pytest.lazy_fixture("row_prettytable"),
-                pytest.lazy_fixture("mix_prettytable"),
+                lf("row_prettytable"),
+                lf("mix_prettytable"),
             ),
         ],
     )
@@ -242,12 +243,12 @@ def test_equivalence_ascii(
         ["left_hand", "right_hand"],
         [
             (
-                pytest.lazy_fixture("row_prettytable"),
-                pytest.lazy_fixture("col_prettytable"),
+                lf("row_prettytable"),
+                lf("col_prettytable"),
             ),
             (
-                pytest.lazy_fixture("row_prettytable"),
-                pytest.lazy_fixture("mix_prettytable"),
+                lf("row_prettytable"),
+                lf("mix_prettytable"),
             ),
         ],
     )
@@ -260,12 +261,12 @@ def test_equivalence_html(
         ["left_hand", "right_hand"],
         [
             (
-                pytest.lazy_fixture("row_prettytable"),
-                pytest.lazy_fixture("col_prettytable"),
+                lf("row_prettytable"),
+                lf("col_prettytable"),
             ),
             (
-                pytest.lazy_fixture("row_prettytable"),
-                pytest.lazy_fixture("mix_prettytable"),
+                lf("row_prettytable"),
+                lf("mix_prettytable"),
             ),
         ],
     )
@@ -1650,7 +1651,7 @@ class TestMultiPattern:
         ["pt", "expected_output", "test_type"],
         [
             (
-                pytest.lazy_fixture("city_data_prettytable"),
+                lf("city_data_prettytable"),
                 """
 +-----------+------+------------+-----------------+
 | City name | Area | Population | Annual Rainfall |
@@ -1667,7 +1668,7 @@ class TestMultiPattern:
                 "English Table",
             ),
             (
-                pytest.lazy_fixture("japanese_pretty_table"),
+                lf("japanese_pretty_table"),
                 """
 +--------+------------+----------+
 | Kanji  |  Hiragana  | English  |
@@ -1686,7 +1687,7 @@ class TestMultiPattern:
                 "Japanese table",
             ),
             (
-                pytest.lazy_fixture("emoji_pretty_table"),
+                lf("emoji_pretty_table"),
                 """
 +-----------------+-----------------+
 |   Thunderbolt   |    Lightning    |