Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/dbusmock/, dev-python/dbusmock/files/
Date: Sun, 01 Dec 2019 16:39:04
Message-Id: 1575217905.406b5c53c966d73fd068cb922fabc42c1c090cd9.leio@gentoo
1 commit: 406b5c53c966d73fd068cb922fabc42c1c090cd9
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 1 16:31:45 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 1 16:31:45 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406b5c53
7
8 dev-python/dbusmock: remove old
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 dev-python/dbusmock/Manifest | 1 -
14 dev-python/dbusmock/dbusmock-0.16.9.ebuild | 46 -------------
15 .../files/0.16.9-disable-style-tests.patch | 14 ----
16 .../files/0.16.9-replace-dbus-launch.patch | 76 ----------------------
17 4 files changed, 137 deletions(-)
18
19 diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
20 index d8da470bc7d..5f6a671d2f1 100644
21 --- a/dev-python/dbusmock/Manifest
22 +++ b/dev-python/dbusmock/Manifest
23 @@ -1,2 +1 @@
24 -DIST dbusmock-0.16.9.tar.gz 71014 BLAKE2B d1c0853cfd06848f1d10afdd8de764814054a44080b44e1ac2ef3a1658a538f1e4c7f5936d65658c16da33ccbc2e94f35d2746f200fc6791f645e1eccc55f6fd SHA512 3aa91f6ede054ed3d3a69f68f3886094e881d266a8f09c7d08a34d10b080a77facde8aae01e75232472c2e643574fe897dae2c3588f5ad9ecf4ec4e67f404f54
25 DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
26
27 diff --git a/dev-python/dbusmock/dbusmock-0.16.9.ebuild b/dev-python/dbusmock/dbusmock-0.16.9.ebuild
28 deleted file mode 100644
29 index 47cb5113fdf..00000000000
30 --- a/dev-python/dbusmock/dbusmock-0.16.9.ebuild
31 +++ /dev/null
32 @@ -1,46 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -PYTHON_COMPAT=( python2_7 python3_{5,6} )
39 -PYTHON_REQ_USE="xml(+)"
40 -
41 -inherit distutils-r1
42 -
43 -MY_PN="python-${PN}"
44 -MY_P="${MY_PN}-${PV}"
45 -S="${WORKDIR}/${MY_P}"
46 -
47 -DESCRIPTION="Easily create mock objects on D-Bus for software testing"
48 -HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
49 -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
50 -
51 -LICENSE="LGPL-3+"
52 -SLOT="0"
53 -KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
54 -IUSE="test"
55 -
56 -RDEPEND="
57 - dev-python/dbus-python[${PYTHON_USEDEP}]
58 - dev-python/pygobject:3[${PYTHON_USEDEP}]"
59 -DEPEND="${RDEPEND}
60 - >=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
61 - test? (
62 - dev-python/nose[${PYTHON_USEDEP}]
63 - )"
64 -
65 -PATCHES=(
66 - "${FILESDIR}"/0.16.9-disable-style-tests.patch
67 - "${FILESDIR}"/0.16.9-replace-dbus-launch.patch
68 -)
69 -
70 -python_test() {
71 - nosetests --verbose || die "tests fail under ${EPYTHON}"
72 -}
73 -
74 -python_install_all() {
75 - local DOCS=( NEWS README.rst )
76 -
77 - distutils-r1_python_install_all
78 -}
79
80 diff --git a/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch b/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch
81 deleted file mode 100644
82 index cb7febdb4e5..00000000000
83 --- a/dev-python/dbusmock/files/0.16.9-disable-style-tests.patch
84 +++ /dev/null
85 @@ -1,14 +0,0 @@
86 -These tests are bound to fail dependending on QA tools updates
87 -
88 -https://github.com/martinpitt/python-dbusmock/issues/28
89 -
90 ---- a/tests/test_code.py 2017-08-16 09:20:43.848503995 +0200
91 -+++ b/tests/test_code.py 2017-08-16 09:20:54.410177037 +0200
92 -@@ -21,6 +21,7 @@
93 - pycodestyle = None
94 -
95 -
96 -+@××××××××.skip('style tests')
97 - class StaticCodeTests(unittest.TestCase):
98 - @unittest.skipIf(subprocess.call(['which', 'pyflakes'], stdout=subprocess.PIPE) != 0,
99 - 'pyflakes not installed')
100
101 diff --git a/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch b/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch
102 deleted file mode 100644
103 index 54149ed033a..00000000000
104 --- a/dev-python/dbusmock/files/0.16.9-replace-dbus-launch.patch
105 +++ /dev/null
106 @@ -1,76 +0,0 @@
107 -From 9470c54a2836795974e83e55ea859e4653b20b37 Mon Sep 17 00:00:00 2001
108 -From: Martin Pitt <martin@××××××.de>
109 -Date: Mon, 19 Jun 2017 16:31:28 +0200
110 -Subject: [PATCH] Call dbus-daemon directly instead of dbus-launch
111 -
112 -dbus-launch is X11 specific and being deprecated.
113 -
114 -Adjust documentation to use dbus-run-session instead.
115 -
116 -https://bugs.debian.org/836053
117 ----
118 - NEWS | 4 ++++
119 - README.rst | 6 +++---
120 - dbusmock/testcase.py | 18 ++++++++++--------
121 - 3 files changed, 17 insertions(+), 11 deletions(-)
122 -
123 -diff --git a/NEWS b/NEWS
124 -index c1250ea..181a4df 100644
125 ---- a/NEWS
126 -+++ b/NEWS
127 -@@ -1,3 +1,7 @@
128 -+0.17 (UNRELEASED)
129 -+-----------------
130 -+ - Call dbus-daemon directly instead of dbus-launch. (Debian #836053)
131 -+
132 - 0.16.9 (2017-06-19)
133 - -------------------
134 - - NetworkManager template: Fix type of 'State' property in AddActiveConnection()
135 -diff --git a/README.rst b/README.rst
136 -index 3dc4552..310e1ac 100644
137 ---- a/README.rst
138 -+++ b/README.rst
139 -@@ -118,9 +118,9 @@ Let's walk through:
140 - Simple example from shell
141 - -------------------------
142 -
143 --We use the actual session bus for this example. You can use ``dbus-launch`` to
144 --start a private one as well if you want, but that is not part of the actual
145 --mocking.
146 -+We use the actual session bus for this example. You can use
147 -+``dbus-run-session`` to start a private one as well if you want, but that is
148 -+not part of the actual mocking.
149 -
150 - So let's start a mock at the D-Bus name ``com.example.Foo`` with an initial
151 - "main" object on path /, with the main D-Bus interface
152 -diff --git a/dbusmock/testcase.py b/dbusmock/testcase.py
153 -index 825c61f..49787e2 100644
154 ---- a/dbusmock/testcase.py
155 -+++ b/dbusmock/testcase.py
156 -@@ -97,16 +97,18 @@ def start_dbus(klass, conf=None):
157 - Normally you do not need to call this directly. Use start_system_bus()
158 - and start_session_bus() instead.
159 - '''
160 -- argv = ['dbus-launch']
161 -+ argv = ['dbus-daemon', '--fork', '--print-address=1', '--print-pid=1']
162 - if conf:
163 - argv.append('--config-file=' + conf)
164 -- out = subprocess.check_output(argv, universal_newlines=True)
165 -- variables = {}
166 -- for line in out.splitlines():
167 -- (k, v) = line.split('=', 1)
168 -- variables[k] = v
169 -- return (int(variables['DBUS_SESSION_BUS_PID']),
170 -- variables['DBUS_SESSION_BUS_ADDRESS'])
171 -+ else:
172 -+ argv.append('--session')
173 -+ lines = subprocess.check_output(argv, universal_newlines=True).strip().splitlines()
174 -+ assert len(lines) == 2, 'expected exactly 2 lines of output from dbus-daemon'
175 -+ # usually the first line is the address, but be lenient and accept any order
176 -+ try:
177 -+ return (int(lines[1]), lines[0])
178 -+ except ValueError:
179 -+ return (int(lines[0]), lines[1])
180 -
181 - @classmethod
182 - def stop_dbus(klass, pid):