diff --git a/pytest-7.3.patch b/pytest-7.3.patch deleted file mode 100644 index 04d7c33875b5087074743401de084e433c7bf999..0000000000000000000000000000000000000000 --- a/pytest-7.3.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 22952337d1b9baaa6d8b6681c56771d0f4cded55 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Tue, 11 Apr 2023 18:55:25 +0200 -Subject: [PATCH] Make the tests work with pytest==7.3.0 - -Fixes https://github.com/pytest-dev/pytest-randomly/issues/539 ---- - tests/test_pytest_randomly.py | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/tests/test_pytest_randomly.py b/tests/test_pytest_randomly.py -index b111d05..66acbd6 100644 ---- a/tests/test_pytest_randomly.py -+++ b/tests/test_pytest_randomly.py -@@ -253,7 +253,7 @@ def test_files_reordered(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[8:12] == [ -+ assert out.outlines[9:13] == [ - "test_b.py::test_it PASSED", - "test_a.py::test_it PASSED", - "test_d.py::test_it PASSED", -@@ -273,7 +273,7 @@ def test_files_reordered_when_seed_not_reset(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[8:12] == [ -+ assert out.outlines[9:13] == [ - "test_b.py::test_it PASSED", - "test_a.py::test_it PASSED", - "test_d.py::test_it PASSED", -@@ -312,7 +312,7 @@ def test_classes_reordered(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[8:12] == [ -+ assert out.outlines[9:13] == [ - "test_one.py::D::test_d PASSED", - "test_one.py::B::test_b PASSED", - "test_one.py::C::test_c PASSED", -@@ -344,7 +344,7 @@ def test_class_test_methods_reordered(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[8:12] == [ -+ assert out.outlines[9:13] == [ - "test_one.py::T::test_c PASSED", - "test_one.py::T::test_b PASSED", - "test_one.py::T::test_a PASSED", -@@ -373,7 +373,7 @@ def test_test_functions_reordered(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[8:12] == [ -+ assert out.outlines[9:13] == [ - "test_one.py::test_c PASSED", - "test_one.py::test_a PASSED", - "test_one.py::test_b PASSED", -@@ -407,7 +407,7 @@ def test_test_functions_reordered_when_randomness_in_module(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[8:12] == [ -+ assert out.outlines[9:13] == [ - "test_one.py::test_c PASSED", - "test_one.py::test_a PASSED", - "test_one.py::test_b PASSED", -@@ -437,7 +437,7 @@ def test_doctests_reordered(ourtestdir): - - out = ourtestdir.runpytest(*args) - out.assert_outcomes(passed=2) -- assert out.outlines[8:10] == [ -+ assert out.outlines[9:11] == [ - "test_one.py::test_one.bar PASSED", - "test_one.py::test_one.foo PASSED", - ] -@@ -518,7 +518,7 @@ def test_doctests_in_txt_files_reordered(ourtestdir): - - out = ourtestdir.runpytest(*args) - out.assert_outcomes(passed=2) -- assert out.outlines[8:10] == [ -+ assert out.outlines[9:11] == [ - "test2.txt::test2.txt PASSED", - "test.txt::test.txt PASSED", - ] --- -2.39.2 - -From 3119095333df234e69c4897d0e51f792854b85cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Tue, 11 Apr 2023 18:57:57 +0200 -Subject: [PATCH] Make the tests work with both pytest 7.2 and 7.3 - -Related: https://github.com/pytest-dev/pytest-randomly/issues/539 ---- - tests/test_pytest_randomly.py | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/tests/test_pytest_randomly.py b/tests/test_pytest_randomly.py -index 66acbd6..66b4ea6 100644 ---- a/tests/test_pytest_randomly.py -+++ b/tests/test_pytest_randomly.py -@@ -16,6 +16,10 @@ except ImportError: - pytest_plugins = ["pytester"] - - -+# See https://github.com/pytest-dev/pytest-randomly/issues/539 -+LINE_START = 9 if pytest.version_tuple >= (7, 3) else 8 -+ -+ - @pytest.fixture(autouse=True) - def reset_entrypoints_cache(): - yield -@@ -253,7 +257,7 @@ def test_files_reordered(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[9:13] == [ -+ assert out.outlines[LINE_START : LINE_START + 4] == [ - "test_b.py::test_it PASSED", - "test_a.py::test_it PASSED", - "test_d.py::test_it PASSED", -@@ -273,7 +277,7 @@ def test_files_reordered_when_seed_not_reset(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[9:13] == [ -+ assert out.outlines[LINE_START : LINE_START + 4] == [ - "test_b.py::test_it PASSED", - "test_a.py::test_it PASSED", - "test_d.py::test_it PASSED", -@@ -312,7 +316,7 @@ def test_classes_reordered(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[9:13] == [ -+ assert out.outlines[LINE_START : LINE_START + 4] == [ - "test_one.py::D::test_d PASSED", - "test_one.py::B::test_b PASSED", - "test_one.py::C::test_c PASSED", -@@ -344,7 +348,7 @@ def test_class_test_methods_reordered(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[9:13] == [ -+ assert out.outlines[LINE_START : LINE_START + 4] == [ - "test_one.py::T::test_c PASSED", - "test_one.py::T::test_b PASSED", - "test_one.py::T::test_a PASSED", -@@ -373,7 +377,7 @@ def test_test_functions_reordered(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[9:13] == [ -+ assert out.outlines[LINE_START : LINE_START + 4] == [ - "test_one.py::test_c PASSED", - "test_one.py::test_a PASSED", - "test_one.py::test_b PASSED", -@@ -407,7 +411,7 @@ def test_test_functions_reordered_when_randomness_in_module(ourtestdir): - out = ourtestdir.runpytest(*args) - - out.assert_outcomes(passed=4, failed=0) -- assert out.outlines[9:13] == [ -+ assert out.outlines[LINE_START : LINE_START + 4] == [ - "test_one.py::test_c PASSED", - "test_one.py::test_a PASSED", - "test_one.py::test_b PASSED", -@@ -437,7 +441,7 @@ def test_doctests_reordered(ourtestdir): - - out = ourtestdir.runpytest(*args) - out.assert_outcomes(passed=2) -- assert out.outlines[9:11] == [ -+ assert out.outlines[LINE_START : LINE_START + 2] == [ - "test_one.py::test_one.bar PASSED", - "test_one.py::test_one.foo PASSED", - ] -@@ -518,7 +522,7 @@ def test_doctests_in_txt_files_reordered(ourtestdir): - - out = ourtestdir.runpytest(*args) - out.assert_outcomes(passed=2) -- assert out.outlines[9:11] == [ -+ assert out.outlines[LINE_START : LINE_START + 2] == [ - "test2.txt::test2.txt PASSED", - "test.txt::test.txt PASSED", - ] --- -2.39.2 - diff --git a/python-pytest-randomly.spec b/python-pytest-randomly.spec index 530a224d580a7e1a8b46337710798fdff92ff2bb..736058cbb27a77a55885720f4409fd69ad7b1c27 100644 --- a/python-pytest-randomly.spec +++ b/python-pytest-randomly.spec @@ -2,14 +2,12 @@ Summary: Pytest plugin to randomly order tests and control random.seed Name: python-%{upstream_name} -Version: 3.12.0 -Release: 6%{?dist} +Version: 3.13.0 +Release: 1%{?dist} License: MIT URL: https://github.com/pytest-dev/pytest-randomly Source0: %{url}/archive/%{version}/%{upstream_name}-%{version}.tar.gz -Patch0001: pytest-7.3.patch - BuildArch: noarch BuildRequires: python3-devel @@ -49,6 +47,9 @@ Summary: %{summary} %doc README.rst HISTORY.rst %changelog +* Mon Sep 25 2023 Shuo Wang - 3.13.0-1 +- update to 3.13.0 + * Tue Sep 19 2023 OpenCloudOS Release Engineering - 3.12.0-6 - Rebuilt for python 3.11 diff --git a/sources b/sources index bac4e7c77ea7248dbc9cc65a89527eb0749e6581..6b8e0425cfd04e2b4e10648e5f03a08e29847595 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pytest-randomly-3.12.0.tar.gz) = e2241c1304b9597f93cc57d6830808f85c59ea1b4815624dcd9d088f87eb4a34d6cb6394de9c31ebedcb8280fb6ff12b110fd5a559ab28c9e0381481fce52c4d +SHA512 (pytest-randomly-3.13.0.tar.gz) = d9b6b965ad03fb504005f55cd1f4db9e733ea2412bb6456e846da8a0366123c4e537c6fea72e341e3f4bbe5fd3b78fce26599100623f26b634c97bf8519f1498