[gentoo-commits] repo/gentoo:master commit in: dev-python/dogpile-cache/, dev-python/dogpile-cache/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/dogpile-cache/, dev-python/dogpile-cache/files/

[Louis Sautier]

commit:     662ef35294fdfa0c4eb5532893ab7d5eb3223aaf
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 12:42:33 2020 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 13:02:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662ef352

dev-python/dogpile-cache: fix setuptools dep. & tests with pytest 6

Closes: https://bugs.gentoo.org/745696
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>

 dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild  |  6 +++++-
 .../files/dogpile-cache-1.0.2-pytest6.patch          | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
index f85ba84273e..e6e677bcd8f 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
@@ -28,4 +27,9 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	# https://github.com/sqlalchemy/dogpile.cache/pull/193
+	"${FILESDIR}/${P}-pytest6.patch"
+)
+
 distutils_enable_tests pytest

diff --git a/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch b/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch
new file mode 100644
index 00000000000..cc815482254
--- /dev/null
+++ b/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch
@@ -0,0 +1,20 @@
+commit 625f73ce189b43541636dc40d8d0e4cd4f9a1386
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Sat Oct 31 02:23:06 2020 +0100
+
+    Support pytest 6
+    
+    See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 10afafb..0b2a1e4 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -26,6 +26,6 @@ def is_unittest(obj):
+ 
+ def pytest_pycollect_makeitem(collector, name, obj):
+     if is_unittest(obj) and not obj.__name__.startswith("_"):
+-        return UnitTestCase(name, parent=collector)
++        return UnitTestCase.from_parent(collector, name=name)
+     else:
+         return []