Hello community, here is the log from the commit of package python-pytest-trio for openSUSE:Factory checked in at 2020-09-06 00:00:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytest-trio (Old) and /work/SRC/openSUSE:Factory/.python-pytest-trio.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-trio" Sun Sep 6 00:00:59 2020 rev:4 rq:829548 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytest-trio/python-pytest-trio.changes 2020-06-10 00:49:10.207063329 +0200 +++ /work/SRC/openSUSE:Factory/.python-pytest-trio.new.3399/python-pytest-trio.changes 2020-09-06 00:01:20.591222015 +0200 @@ -1,0 +2,5 @@ +Tue Aug 25 11:18:03 UTC 2020 - Marketa Calabkova <[email protected]> + +- Add patch pytest6.patch to fix build + +------------------------------------------------------------------- New: ---- pytest6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytest-trio.spec ++++++ --- /var/tmp/diff_new_pack.wbByx2/_old 2020-09-06 00:01:23.627223535 +0200 +++ /var/tmp/diff_new_pack.wbByx2/_new 2020-09-06 00:01:23.627223535 +0200 @@ -25,6 +25,7 @@ License: MIT OR Apache-2.0 URL: https://github.com/python-trio/pytest-trio Source: https://github.com/python-trio/pytest-trio/archive/v%{version}.tar.gz +Patch0: pytest6.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -38,8 +39,9 @@ BuildRequires: %{python_module contextvars >= 2.1} BuildRequires: %{python_module hypothesis >= 3.64} BuildRequires: %{python_module outcome} -BuildRequires: %{python_module pytest >= 3.6} BuildRequires: %{python_module pytest-cov} +# we really need newer pytest in tests than is required by the package +BuildRequires: %{python_module pytest >= 6.0.0} BuildRequires: %{python_module trio >= 0.15.0} # /SECTION %python_subpackages @@ -49,6 +51,7 @@ %prep %setup -q -n pytest-trio-%{version} +%patch0 -p1 %build %python_build ++++++ pytest6.patch ++++++ >From bfef85c948cfe6bf19c78baa2d497caf7b56d81a Mon Sep 17 00:00:00 2001 From: Kyle Altendorf <[email protected]> Date: Sat, 22 Aug 2020 17:58:08 -0400 Subject: [PATCH] Update .assert_outcomes() calls for pytest 6.0 https://github.com/python-trio/pytest-trio/pull/98#issuecomment-678699693 --- pytest_trio/_tests/test_fixture_mistakes.py | 8 ++++---- test-requirements.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pytest_trio/_tests/test_fixture_mistakes.py b/pytest_trio/_tests/test_fixture_mistakes.py index 6da6abb..5521a80 100644 --- a/pytest_trio/_tests/test_fixture_mistakes.py +++ b/pytest_trio/_tests/test_fixture_mistakes.py @@ -34,7 +34,7 @@ def test_sync_indirect(indirect_trio_time): result = testdir.runpytest() - result.assert_outcomes(passed=1, error=2) + result.assert_outcomes(passed=1, errors=2) result.stdout.fnmatch_lines( ["*: Trio fixtures can only be used by Trio tests*"] ) @@ -65,7 +65,7 @@ async def test_foo(self, async_class_fixture): result = testdir.runpytest() - result.assert_outcomes(error=1) + result.assert_outcomes(errors=1) result.stdout.fnmatch_lines(["*: Trio fixtures must be function-scope*"]) @@ -89,7 +89,7 @@ async def test_whatever(async_session_fixture): result = testdir.runpytest() - result.assert_outcomes(error=1) + result.assert_outcomes(errors=1) result.stdout.fnmatch_lines(["*: Trio fixtures must be function-scope*"]) @@ -113,7 +113,7 @@ def test_whatever(async_fixture): result = testdir.runpytest() - result.assert_outcomes(error=1) + result.assert_outcomes(errors=1) result.stdout.fnmatch_lines( ["*: Trio fixtures can only be used by Trio tests*"] ) diff --git a/test-requirements.txt b/test-requirements.txt index b2be0f9..5c53c25 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,3 @@ -pytest !=3.7.0, !=3.7.1 # https://github.com/python-trio/pytest-trio/pull/50#issuecomment-413124393 +pytest >= 6.0.0 # https://github.com/python-trio/pytest-trio/pull/98#issuecomment-678699693 pytest-cov hypothesis>=3.64
