From f7ab4431f9b7e2cb491da8933a5e8ff7470af3f5 Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Tue, 12 Mar 2024 11:48:10 +0000 Subject: [PATCH] Switch fully to AdvancedDataRegressionFixture --- stubs.txt | 1 - tests/test_requirements.py | 5 ++--- tests/test_requirements_win.py | 6 +++--- tests/test_sdist.py | 3 ++- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/stubs.txt b/stubs.txt index 5577762..163f455 100644 --- a/stubs.txt +++ b/stubs.txt @@ -1,3 +1,2 @@ -git+https://github.com/domdfcoding/pytest-regressions-stubs git+https://github.com/repo-helper/toml@py.typed types-requests diff --git a/tests/test_requirements.py b/tests/test_requirements.py index aa4762b..8bee1f1 100644 --- a/tests/test_requirements.py +++ b/tests/test_requirements.py @@ -10,7 +10,6 @@ from domdf_python_tools.paths import PathPlus from packaging.requirements import Requirement from packaging.specifiers import Specifier, SpecifierSet -from pytest_regressions.data_regression import DataRegressionFixture from typing_extensions import Literal # this package @@ -584,11 +583,11 @@ def test_list_requirements( @pytest.mark.parametrize("depth", [-1, 0, 1, 2, 3]) # @pytest.mark.parametrize("depth", [3]) def test_list_requirements_pytest( - data_regression: DataRegressionFixture, + advanced_data_regression: AdvancedDataRegressionFixture, depth: int, py_version: str, ): - data_regression.check(list(list_requirements("pytest", depth=depth))) + advanced_data_regression.check(list(list_requirements("pytest", depth=depth))) @pytest.fixture() diff --git a/tests/test_requirements_win.py b/tests/test_requirements_win.py index 0063887..4146270 100644 --- a/tests/test_requirements_win.py +++ b/tests/test_requirements_win.py @@ -1,10 +1,10 @@ # stdlib import sys +from coincidence.regressions import AdvancedDataRegressionFixture # 3rd party import pytest from coincidence import only_windows -from pytest_regressions.data_regression import DataRegressionFixture # this package from shippinglabel.requirements import list_requirements @@ -29,8 +29,8 @@ ) @pytest.mark.parametrize("depth", [-1, 0, 1, 2, 3]) def test_list_requirements_pytest( - data_regression: DataRegressionFixture, + advanced_data_regression: AdvancedDataRegressionFixture, depth: int, py_version: str, ): - data_regression.check(list(list_requirements("pytest", depth=depth))) + advanced_data_regression.check(list(list_requirements("pytest", depth=depth))) diff --git a/tests/test_sdist.py b/tests/test_sdist.py index c16dd28..51a96e5 100644 --- a/tests/test_sdist.py +++ b/tests/test_sdist.py @@ -1,4 +1,5 @@ # 3rd party +from coincidence.regressions import AdvancedDataRegressionFixture import pytest from packaging.utils import InvalidSdistFilename from pytest_regressions.data_regression import DataRegressionFixture @@ -41,7 +42,7 @@ "numpy-1.16.5.zip", ] ) -def test_parse_sdist_filename(filename: str, advanced_data_regression: DataRegressionFixture): +def test_parse_sdist_filename(filename: str, advanced_data_regression: AdvancedDataRegressionFixture): parsed_filename = parse_sdist_filename(filename) advanced_data_regression.check(parsed_filename) assert str(parsed_filename) == filename