gentoo resync : 16.09.2020

3 files changed, 2 insertions, 42 deletions

diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 0be0c9a21ba5..85dbc905b545 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,5 +1,4 @@
 AUX pytest-mock-2.0.0-warnings.patch 1363 BLAKE2B 67611daf7c070a0de2d368506b3e34653940f21bf565b0d7361b5f1e759c84533001f68483e1ca301e86cf2d734e10f973737f3775f898928c4b4c2d1aee9bf1 SHA512 6b306f19834559223af3e64372d46fed0146a783a6f134ed07883742b5ba1ad974fd3ba440376350345f939105e84abd8efdc7bf99cb9796eb638ba2c22e4e64
-AUX pytest-mock-3.1.0-warnings.patch 1373 BLAKE2B 1bac1315bb8d95d1e6435aa15415dd973d2834cd9fb68867b99d72f5b8233c736b40d3865d19ec9f4042387f3d01e57a0055f992fa7a37f2084c043be52c7e88 SHA512 177a318dee0957ff761d02db57890bedf3f780ce46e3d756f21c2c743d264e982eb9a711b17647ad2fb43e17f9f1b30808e943b5c89076b9c905c16e57a3e313
 DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa SHA512 6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
 DIST pytest-mock-2.0.0.tar.gz 24665 BLAKE2B 31a3464e8bff5a2109716e95492ce1d59f2555769e69cccf4012bc268f88c5eeca99924006bdc78cc5e20cf227860d845bead9656aba1c081da58effb38ea100 SHA512 8bd7f634afebeae628470270c81f0198647bf8cd5b0fac438891d881d9823e40e814d598670bb9c9722b864990958e69d385c7c6a6e2adc81d2adcb303fbe0b0
 DIST pytest-mock-3.2.0.tar.gz 25569 BLAKE2B e6a1ab23142cf3d7ac9385ac221bfce680c7b982cb489306557b60ca81563718cb9b7fcbb149cccb2cf6f06de5c3fa737d28b0711a3197fbbc86e432c5f4e614 SHA512 1ff442e26339ac41414a8678303fbc7eab573964661c664ef029c3b3377df4ab40173976316ef99e49dd208dc1e3c7cd0a0090f5453865343090cc9439f85fa9
@@ -9,5 +8,5 @@ EBUILD pytest-mock-1.11.2.ebuild 1456 BLAKE2B 79673aaf4f03ec6c5475e68a5eb5960bea
 EBUILD pytest-mock-2.0.0.ebuild 1112 BLAKE2B e84f9be37980feef82140399dc81f41141ce42d2b3304bbb93c31b444975a1976fadbff5ebb5a9d4a1ad5127a04172a8d88d4d2be7c176560b980cb1d20de160 SHA512 c726eccf84c8e58b34a479cc7f0741f1e80830f39f631c223399f851351426b3959293990348823e794bbe25e0c0578d9ccb0990d1d03f87947e1a457e557979
 EBUILD pytest-mock-3.2.0.ebuild 970 BLAKE2B c2d9bf51aa358b3748bedbc4b8fc73a47f1ae9c6d0af02d98847ecf72edca0334f7d7846b4ad2c95da73da2063ea71722926afe1eb4eb3a8fb29291858594920 SHA512 322d6aa0f181cf291d0a46471018d1ec717dc4c8f1122ad2cc71a8d1feac7f025e489712cae90769e287444055b8f2887a5a447828d2ebc16e407f575312cd30
 EBUILD pytest-mock-3.3.0.ebuild 978 BLAKE2B 121c1744dd24724d6573014125f7551dc519e1958df58c684da83850ea50baa0d545e1cc90360780442acd0df173e9d27a7c84acdf27c397b7d1d8f6e3b35c8e SHA512 89c6d2e5c974101ce96916c46a5031312dc4adf2e5d88082c638478595acbeac69f259789f85520e8577a8b38d55e46b68bdfc6337292fea8cd81ce76eb66062
-EBUILD pytest-mock-3.3.1.ebuild 978 BLAKE2B 121c1744dd24724d6573014125f7551dc519e1958df58c684da83850ea50baa0d545e1cc90360780442acd0df173e9d27a7c84acdf27c397b7d1d8f6e3b35c8e SHA512 89c6d2e5c974101ce96916c46a5031312dc4adf2e5d88082c638478595acbeac69f259789f85520e8577a8b38d55e46b68bdfc6337292fea8cd81ce76eb66062
+EBUILD pytest-mock-3.3.1.ebuild 985 BLAKE2B 30be5d360b8742cc9929f450c36c9c6f0205280379646963a889f2c2ac67b9af99803d903d4b5cbd8e20d2afc8ace4b513e328d6256f66f87659b9409425d2ca SHA512 3a89a01fe99c3594e1134fec2d1523fde5f0df18d140c882a886689e521e37abb08b027e254b5328a94a058eddbc128891798982ca4fd9de1ca50bfe58b434dc
 MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
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 4851afe9d1ba..000000000000
--- 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
-
diff --git a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
index a646df8a08aa..bc5e1e840ae8 100644
--- a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"