1 |
commit: 662ef35294fdfa0c4eb5532893ab7d5eb3223aaf |
2 |
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 31 12:42:33 2020 +0000 |
4 |
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 31 13:02:03 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662ef352 |
7 |
|
8 |
dev-python/dogpile-cache: fix setuptools dep. & tests with pytest 6 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/745696 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
12 |
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org> |
13 |
|
14 |
dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild | 6 +++++- |
15 |
.../files/dogpile-cache-1.0.2-pytest6.patch | 20 ++++++++++++++++++++ |
16 |
2 files changed, 25 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild |
19 |
index f85ba84273e..e6e677bcd8f 100644 |
20 |
--- a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild |
21 |
+++ b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild |
22 |
@@ -3,7 +3,6 @@ |
23 |
|
24 |
EAPI=7 |
25 |
|
26 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
27 |
PYTHON_COMPAT=( python3_{6..9} ) |
28 |
|
29 |
inherit distutils-r1 |
30 |
@@ -28,4 +27,9 @@ BDEPEND=" |
31 |
) |
32 |
" |
33 |
|
34 |
+PATCHES=( |
35 |
+ # https://github.com/sqlalchemy/dogpile.cache/pull/193 |
36 |
+ "${FILESDIR}/${P}-pytest6.patch" |
37 |
+) |
38 |
+ |
39 |
distutils_enable_tests pytest |
40 |
|
41 |
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 |
42 |
new file mode 100644 |
43 |
index 00000000000..cc815482254 |
44 |
--- /dev/null |
45 |
+++ b/dev-python/dogpile-cache/files/dogpile-cache-1.0.2-pytest6.patch |
46 |
@@ -0,0 +1,20 @@ |
47 |
+commit 625f73ce189b43541636dc40d8d0e4cd4f9a1386 |
48 |
+Author: Louis Sautier <sautier.louis@×××××.com> |
49 |
+Date: Sat Oct 31 02:23:06 2020 +0100 |
50 |
+ |
51 |
+ Support pytest 6 |
52 |
+ |
53 |
+ See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent |
54 |
+ |
55 |
+diff --git a/tests/conftest.py b/tests/conftest.py |
56 |
+index 10afafb..0b2a1e4 100644 |
57 |
+--- a/tests/conftest.py |
58 |
++++ b/tests/conftest.py |
59 |
+@@ -26,6 +26,6 @@ def is_unittest(obj): |
60 |
+ |
61 |
+ def pytest_pycollect_makeitem(collector, name, obj): |
62 |
+ if is_unittest(obj) and not obj.__name__.startswith("_"): |
63 |
+- return UnitTestCase(name, parent=collector) |
64 |
++ return UnitTestCase.from_parent(collector, name=name) |
65 |
+ else: |
66 |
+ return [] |