Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python-daemon/files/, dev-python/python-daemon/
Date: Sat, 06 Nov 2021 19:59:36
Message-Id: 1636228756.3bec2f93f9bb88abcc5e3a952b12e62281cc52d9.arthurzam@gentoo
1 commit: 3bec2f93f9bb88abcc5e3a952b12e62281cc52d9
2 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 6 19:44:52 2021 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 6 19:59:16 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bec2f93
7
8 dev-python/python-daemon: enable py3.10
9
10 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
11
12 .../files/python-daemon-2.3.0-fix-py3.10.patch | 28 ++++++++++++++++++++++
13 .../python-daemon/python-daemon-2.3.0-r1.ebuild | 6 ++++-
14 2 files changed, 33 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-python/python-daemon/files/python-daemon-2.3.0-fix-py3.10.patch b/dev-python/python-daemon/files/python-daemon-2.3.0-fix-py3.10.patch
17 new file mode 100644
18 index 00000000000..4fd082dc8f7
19 --- /dev/null
20 +++ b/dev-python/python-daemon/files/python-daemon-2.3.0-fix-py3.10.patch
21 @@ -0,0 +1,28 @@
22 +https://pagure.io/python-daemon/c/0c67a3c6407fbf4483ccfc94a7a0d78cf3379296
23 +
24 +From: Miro Hrončok <miro@×××××××.cz>
25 +Date: Sep 29 2021 10:05:27 +0000
26 +Subject: Remove incorrect double-patch of objects in test cases.
27 +
28 +The specific test cases relying on the patches, already are decorated
29 +to patch the specific attributes needed. We don't need a general patch
30 +of the attributes in the test case setup.
31 +
32 +Signed-off-by: Ben Finney <ben+python@××××××××××××.au>
33 +
34 +--- a/test/test_pidfile.py
35 ++++ b/test/test_pidfile.py
36 +@@ -367,12 +367,6 @@ class TimeoutPIDLockFile_TestCase(scaffold.TestCase):
37 + pidlockfile_scenarios = make_pidlockfile_scenarios()
38 + self.pidlockfile_scenario = pidlockfile_scenarios['simple']
39 +
40 +- for func_name in ['__init__', 'acquire']:
41 +- func_patcher = unittest.mock.patch.object(
42 +- lockfile.pidlockfile.PIDLockFile, func_name)
43 +- func_patcher.start()
44 +- self.addCleanup(func_patcher.stop)
45 +-
46 + self.scenario = {
47 + 'pidfile_path': self.pidlockfile_scenario['pidfile_path'],
48 + 'acquire_timeout': self.getUniqueInteger(),
49 +
50
51 diff --git a/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild b/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
52 index ebd89363d0b..6cb93f1a836 100644
53 --- a/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
54 +++ b/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
55 @@ -4,7 +4,7 @@
56 EAPI=7
57
58 DISTUTILS_USE_SETUPTOOLS=rdepend
59 -PYTHON_COMPAT=( python3_{8..9} pypy3 )
60 +PYTHON_COMPAT=( python3_{8..10} pypy3 )
61
62 inherit distutils-r1
63
64 @@ -29,6 +29,10 @@ BDEPEND="
65 )
66 "
67
68 +PATCHES=(
69 + "${FILESDIR}/${P}-fix-py3.10.patch"
70 +)
71 +
72 distutils_enable_tests unittest
73
74 src_prepare() {