From 6cae8c38a883c7cc44d7848a44d31d4d423cea70442007f06044c29be5a1e44d Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Wed, 30 Nov 2022 11:28:26 +0000 Subject: [PATCH] - Remove python_module macro definition - Remove pytest-mock-issue272-asyncio.patch - Add python-py dependency - Update to 3.10.0: * Added new mocker.stop(m) method to stop specific mocker.patch or mocker.spy calls (#319). - 3.9.0: * Expose NonCallableMagicMock via the mocker fixture (#318). - 3.8.2: * Fixed AsyncMock support for Python 3.7+ in mocker.async_stub (#302). - 3.8.1: * Fix regression caused by an explicit mock dependency in the code (#298). - 3.8.0: * Add MockerFixture.async_mock method. Thanks @PerchunPak for the PR (#296). - 3.7.0: * Python 3.10 now officially supported. * Dropped support for Python 3.6. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-mock?expand=0&rev=32 --- pytest-mock-3.10.0.tar.gz | 3 ++ pytest-mock-3.6.1.tar.gz | 3 -- pytest-mock-issue272-asyncio.patch | 46 ------------------------------ python-pytest-mock.changes | 21 ++++++++++++++ python-pytest-mock.spec | 7 ++--- 5 files changed, 27 insertions(+), 53 deletions(-) create mode 100644 pytest-mock-3.10.0.tar.gz delete mode 100644 pytest-mock-3.6.1.tar.gz delete mode 100644 pytest-mock-issue272-asyncio.patch diff --git a/pytest-mock-3.10.0.tar.gz b/pytest-mock-3.10.0.tar.gz new file mode 100644 index 0000000..9ae1ea7 --- /dev/null +++ b/pytest-mock-3.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbbdb085ef7c252a326fd8cdcac0aa3b1333d8811f131bdcc701002e1be7ed4f +size 28384 diff --git a/pytest-mock-3.6.1.tar.gz b/pytest-mock-3.6.1.tar.gz deleted file mode 100644 index a61e9ca..0000000 --- a/pytest-mock-3.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40217a058c52a63f1042f0784f62009e976ba824c418cced42e88d5f40ab0e62 -size 29933 diff --git a/pytest-mock-issue272-asyncio.patch b/pytest-mock-issue272-asyncio.patch deleted file mode 100644 index 494c290..0000000 --- a/pytest-mock-issue272-asyncio.patch +++ /dev/null @@ -1,46 +0,0 @@ -Index: pytest-mock-3.6.1/tests/test_pytest_mock.py -=================================================================== ---- pytest-mock-3.6.1.orig/tests/test_pytest_mock.py -+++ pytest-mock-3.6.1/tests/test_pytest_mock.py -@@ -839,7 +839,7 @@ def test_plain_stopall(testdir: Any) -> - """ - ) - result = testdir.runpytest_subprocess() -- result.stdout.fnmatch_lines("* 1 passed in *") -+ result.stdout.fnmatch_lines("* 1 passed*") - assert "RuntimeError" not in result.stderr.str() - - -@@ -978,7 +978,7 @@ def test_used_with_class_scope(testdir: - ) - result = testdir.runpytest_subprocess() - assert "AssertionError" not in result.stderr.str() -- result.stdout.fnmatch_lines("* 1 passed in *") -+ result.stdout.fnmatch_lines("* 1 passed*") - - - def test_used_with_module_scope(testdir: Any) -> None: -@@ -1000,7 +1000,7 @@ def test_used_with_module_scope(testdir: - ) - result = testdir.runpytest_subprocess() - assert "AssertionError" not in result.stderr.str() -- result.stdout.fnmatch_lines("* 1 passed in *") -+ result.stdout.fnmatch_lines("* 1 passed*") - - - def test_used_with_package_scope(testdir: Any) -> None: -@@ -1023,7 +1023,7 @@ def test_used_with_package_scope(testdir - ) - result = testdir.runpytest_subprocess() - assert "AssertionError" not in result.stderr.str() -- result.stdout.fnmatch_lines("* 1 passed in *") -+ result.stdout.fnmatch_lines("* 1 passed*") - - - def test_used_with_session_scope(testdir: Any) -> None: -@@ -1046,4 +1046,4 @@ def test_used_with_session_scope(testdir - ) - result = testdir.runpytest_subprocess() - assert "AssertionError" not in result.stderr.str() -- result.stdout.fnmatch_lines("* 1 passed in *") -+ result.stdout.fnmatch_lines("* 1 passed*") diff --git a/python-pytest-mock.changes b/python-pytest-mock.changes index 5b82bb9..1bd5781 100644 --- a/python-pytest-mock.changes +++ b/python-pytest-mock.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Nov 30 11:25:21 UTC 2022 - Daniel Garcia + +- Remove python_module macro definition +- Remove pytest-mock-issue272-asyncio.patch +- Add python-py dependency +- Update to 3.10.0: + * Added new mocker.stop(m) method to stop specific mocker.patch or mocker.spy + calls (#319). +- 3.9.0: + * Expose NonCallableMagicMock via the mocker fixture (#318). +- 3.8.2: + * Fixed AsyncMock support for Python 3.7+ in mocker.async_stub (#302). +- 3.8.1: + * Fix regression caused by an explicit mock dependency in the code (#298). +- 3.8.0: + * Add MockerFixture.async_mock method. Thanks @PerchunPak for the PR (#296). +- 3.7.0: + * Python 3.10 now officially supported. + * Dropped support for Python 3.6. + ------------------------------------------------------------------- Sat Jan 22 11:58:55 UTC 2022 - Ben Greiner diff --git a/python-pytest-mock.spec b/python-pytest-mock.spec index a3e21de..843ec68 100644 --- a/python-pytest-mock.spec +++ b/python-pytest-mock.spec @@ -16,23 +16,22 @@ # -%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-pytest-mock -Version: 3.6.1 +Version: 3.10.0 Release: 0 Summary: Thin-wrapper around the mock package for easier use with pytest License: MIT URL: https://github.com/pytest-dev/pytest-mock Source: https://files.pythonhosted.org/packages/source/p/pytest-mock/pytest-mock-%{version}.tar.gz -# PATCH-FIX-UPSTREAM pytest-mock-issue272-asyncio.patch -- gh#pytest-dev/pytest-mock#272 -Patch0: pytest-mock-issue272-asyncio.patch BuildRequires: %{python_module pytest >= 5} BuildRequires: %{python_module pytest-asyncio} +BuildRequires: %{python_module py} BuildRequires: %{python_module setuptools >= 36} BuildRequires: %{python_module setuptools_scm} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-py Requires: python-pytest BuildArch: noarch %python_subpackages