[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-mock/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-mock/files/

[David Seifert]

commit:     84d1d4fea498af3ea22d47484a68f45950a30e27
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 28 16:58:56 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 09:54:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d1d4fe

dev-python/pytest-mock: remove unused patch

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/pytest-mock-3.1.0-warnings.patch         | 39 ----------------------
 1 file changed, 39 deletions(-)

diff --git a/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch b/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch
deleted file mode 100644
index 4851afe9d1b..00000000000
--- a/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1ef3d6111a8e4f32dfa9a2c311b6996afd9e98a5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 26 May 2020 10:56:27 +0200
-Subject: [PATCH] Permit warnings in *_stale_pyc tests
-
-The *_stale_pyc test is repeatedly failing on production systems
-due to additional pytest plugins being installed and triggering
-PytestAssertRewriteWarnings.  This causes 'passed *' string not to match
-because of the ',' after 'passed'.  Match just 'passed*' instead
-to solve this.
----
- tests/test_pytest_mock.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py
-index 73509a4..5e1a502 100644
---- a/tests/test_pytest_mock.py
-+++ b/tests/test_pytest_mock.py
-@@ -809,7 +809,7 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir):
-     """
-     )
-     result = testdir.runpytest()
--    result.stdout.fnmatch_lines("* 1 passed *")
-+    result.stdout.fnmatch_lines("* 1 passed*")
- 
-     kwargs = {"legacy": True}
-     assert compileall.compile_file(str(py_fn), **kwargs)
-@@ -819,7 +819,7 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir):
- 
-     py_fn.remove()
-     result = testdir.runpytest()
--    result.stdout.fnmatch_lines("* 1 passed *")
-+    result.stdout.fnmatch_lines("* 1 passed*")
- 
- 
- def test_used_with_class_scope(testdir):
--- 
-2.26.2
-

[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-mock/files/

[Zac Medico]

commit:     2a23f10bfac12c62a3b8cbeb8772679cf9688917
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Nov 15 18:42:48 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 21:30:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a23f10b

dev-python/pytest-mock: remove unused patch(es)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 .../files/pytest-mock-2.0.0-warnings.patch         | 36 ----------------------
 1 file changed, 36 deletions(-)

diff --git a/dev-python/pytest-mock/files/pytest-mock-2.0.0-warnings.patch b/dev-python/pytest-mock/files/pytest-mock-2.0.0-warnings.patch
deleted file mode 100644
index bea2bb14b15..00000000000
--- a/dev-python/pytest-mock/files/pytest-mock-2.0.0-warnings.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 09477f0d28f3b6b9fa36b861d701c9d1a937e553 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 26 May 2020 10:56:27 +0200
-Subject: [PATCH] Permit warnings in *_stale_pyc tests
-
-The *_stale_pyc test is repeatedly failing on production systems
-due to additional pytest plugins being installed and triggering
-PytestAssertRewriteWarnings.  This causes 'passed *' string not to match
-because of the ',' after 'passed'.  Match just 'passed*' instead
-to solve this.
----
- tests/test_pytest_mock.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py
-index d1635f5..e85f392 100644
---- a/tests/test_pytest_mock.py
-+++ b/tests/test_pytest_mock.py
-@@ -801,7 +801,7 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir):
-     """
-     )
-     result = testdir.runpytest()
--    result.stdout.fnmatch_lines("* 1 passed *")
-+    result.stdout.fnmatch_lines("* 1 passed*")
- 
-     kwargs = {"legacy": True} if sys.version_info[0] >= 3 else {}
-     assert compileall.compile_file(str(py_fn), **kwargs)
-@@ -811,4 +811,4 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir):
- 
-     py_fn.remove()
-     result = testdir.runpytest()
--    result.stdout.fnmatch_lines("* 1 passed *")
-+    result.stdout.fnmatch_lines("* 1 passed*")
--- 
-2.26.2
-