gentoo resync : 29.12.2022

3 files changed, 59 insertions, 3 deletions

diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index cbaae94e2266..959eaab95abd 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,3 +1,4 @@
+AUX requests-mock-1.9.3-obj-has-no-attr-url.patch 1487 BLAKE2B 39eb1825f81ec59cfff7cad41ac59d1474ee778c09fafeb75bbeecccb48048bc52c6bab6a92e3844306235a2f1431c1c2ac953b21b91f70796406c128c40dd74 SHA512 cff51875e8d437040c27dc4931ffcfb50869c19acd05020362c25696ed0cd961fdf7fa195e6198b71f5ce4ebaeaa5de40629ec2e60bcc90f63760b0d0791ea8a
 DIST requests-mock-1.9.3.tar.gz 67988 BLAKE2B 8ab651adbde9e18370641655589f5d209d2a9ae07d82108c64e4269757217cf01588066ebc3005852cf48527f911d3fb76cedce3e88bc74123db81725b4b5865 SHA512 bcded541d78670a1b1fc87f97d35286ab4bafd6946beb9d9b44886454c26a4d8c05834add18914f3f72b1d3c0534311efd1cc80e711b5085eb63053ae24cbb6f
-EBUILD requests-mock-1.9.3.ebuild 1284 BLAKE2B 35058bd62aa7959fc1252e78f7aa29b0a682278036349fbb75e4fadf538d342b375fb5e18e96cfae3cad0f0ad15e03748c0774a1c897770be70769b0ad92dd01 SHA512 49eeb4aba7c663320f2d2189e37e00abf96510e04d6a5dbe359d5fb50a1f22b54bfa592036ba6cd36e7794c93154b7bbbeaced49948ca34798330d977b21242a
+EBUILD requests-mock-1.9.3-r1.ebuild 1375 BLAKE2B 3edc56830426806a4148f18b77376ced1aaa3bc20ceb748ed76137ee211402636f154acbde1c52874c393f5f5d30399eee3e8592c8c80312707c0e1ea54d8f89 SHA512 ab33c1f5f5a43c864c97f202ecbe08db72c8d3e104af375fb2283ea01c916d3644a62dea1c4651e3cff8c8c6eb4436f699afca091811072eac2221ff61b726af
 MISC metadata.xml 479 BLAKE2B ddd64d016f85e6960f2d8a10d53591c6ffa5c0f61ebc4074f5867a03c0d8f533468351b87cb10e662391aa3d8fdd61b07bcf607c1d5b07a13fe85cf600def424 SHA512 341437e0fb7b532b7845d000e0647ed9858efe1336e8b6f57f55f677483eae4985ac0f54016da09d22d007895f3450a5e1fa6cf5d20fa715f74466a4cdf43cfa
diff --git a/dev-python/requests-mock/files/requests-mock-1.9.3-obj-has-no-attr-url.patch b/dev-python/requests-mock/files/requests-mock-1.9.3-obj-has-no-attr-url.patch
new file mode 100644
index 000000000000..d43b0b41e65a
--- /dev/null
+++ b/dev-python/requests-mock/files/requests-mock-1.9.3-obj-has-no-attr-url.patch
@@ -0,0 +1,50 @@
+From 7238c1148c756e6a27c3dbc1ccbff7a3e9a60d82 Mon Sep 17 00:00:00 2001
+From: Jamie Lennox <jamielennox@gmail.com>
+Date: Fri, 28 May 2021 09:33:25 +0700
+Subject: [PATCH] Fix failing pytest
+
+When you start a method with test_ pytest loads it and tries to parse
+the parameters as fixtures. In this case it's not a real test, just a
+matcher function used later on in the test file.
+
+We can inline it into the function as it's only used in one place.
+
+Fixes: #175
+---
+ tests/test_custom_matchers.py | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/tests/test_custom_matchers.py b/tests/test_custom_matchers.py
+index d49f72a..546a63e 100644
+--- a/tests/test_custom_matchers.py
++++ b/tests/test_custom_matchers.py
+@@ -31,13 +31,6 @@ def match_all(request):
+     return requests_mock.create_response(request, content=six.b('data'))
+ 
+ 
+-def test_a(request):
+-    if 'a' in request.url:
+-        return match_all(request)
+-
+-    return None
+-
+-
+ class CustomMatchersTests(base.TestCase):
+ 
+     def assertMatchAll(self, resp):
+@@ -65,7 +58,14 @@ def test_failing_matcher(self, mocker):
+ 
+     @requests_mock.Mocker()
+     def test_some_pass(self, mocker):
+-        mocker.add_matcher(test_a)
++
++        def matcher_a(request):
++            if 'a' in request.url:
++                return match_all(request)
++
++            return None
++
++        mocker.add_matcher(matcher_a)
+ 
+         resp = requests.get('http://any/thing')
+         self.assertMatchAll(resp)
diff --git a/dev-python/requests-mock/requests-mock-1.9.3.ebuild b/dev-python/requests-mock/requests-mock-1.9.3-r1.ebuild
index bbb1ed73affa..f6ab5d2b33d0 100644
--- a/dev-python/requests-mock/requests-mock-1.9.3.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.9.3-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Mock out responses from the requests package"
@@ -28,6 +29,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-obj-has-no-attr-url.patch"
+)
+
 distutils_enable_sphinx doc/source
 distutils_enable_tests pytest