Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/
Date: Tue, 01 Mar 2022 09:38:08
Message-Id: 1646127482.5eb222cbb8c9b29eb31b8757598a5722a78369b6.mgorny@gentoo
1 commit: 5eb222cbb8c9b29eb31b8757598a5722a78369b6
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 1 08:59:57 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 1 09:38:02 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb222cb
7
8 dev-python/QtPy: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/QtPy/Manifest | 2 -
13 dev-python/QtPy/QtPy-1.11.2.ebuild | 158 ----------------------------------
14 dev-python/QtPy/QtPy-1.11.3-r1.ebuild | 139 ------------------------------
15 3 files changed, 299 deletions(-)
16
17 diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
18 index 6bb3ddeff649..dfd253d5f51f 100644
19 --- a/dev-python/QtPy/Manifest
20 +++ b/dev-python/QtPy/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST QtPy-1.11.2.tar.gz 37098 BLAKE2B 8806cce798c4c2d885dd340d0d077567353cf0f3f1c2b284fd788c190b28b6133d052d31dea861e7d2497d0db88ba7ce8be83074360c61823f7a78dc01c015a5 SHA512 e49beb3180789a8080a19406b0e122bc9fc2192ac89b59f0956d7c65ac957779b192062956a97a7526f32724000df18abf32ddd6bda52f9cdf440ddc551887f8
23 -DIST QtPy-1.11.3.tar.gz 39637 BLAKE2B d1bfa0944dcebf5e408b9a061bcc6bab2fe172a70f0eadd36b229d2c9b40d74d8159c820608d3afd71a91085d5703af9b7045f359209730c53a9a83007159ce5 SHA512 461d858b05ff75f27017f6f0058f3e47643d5fe6c236e4307fa006735ad80e4c1fa487f1ab75edcfe881026541e302cdc3f8221c4ad7b97bce8c96b66db580bb
24 DIST QtPy-2.0.0.tar.gz 39628 BLAKE2B bc1b2cf975c3457cb026016854ec70e0aa3247c1234643dbf95681f655678e43ba0200b26e16a0b9eafd6fb373c1f876d9a54458ceb9b9b035ad463b7874db2c SHA512 95855c305da7f54850bcb6297a1f12ceda79eaf6d9b01771b1391d2d7b07b8f690e134cc2d52417bcc320395dce8c1f7f5c6ccadf2939db196e0ed5441215d5a
25 DIST QtPy-2.0.1.tar.gz 43047 BLAKE2B 66625852e75fbfcf0bf96e740754ca26b6d5226dd5450d0274cf6dc875cba18e5ed8e339c8c7ad084ffa9b135f19447e087b338690ec521205316c4f22f09197 SHA512 5d482b0a5bd2be67a0fabccf98a9dedf28ef328641c8c976e2274d4a5afb14b9fefce251e80496ed54425dcb3da24984c6c36308db0bfc810ea2142528ad88fd
26
27 diff --git a/dev-python/QtPy/QtPy-1.11.2.ebuild b/dev-python/QtPy/QtPy-1.11.2.ebuild
28 deleted file mode 100644
29 index 80a6b0988c86..000000000000
30 --- a/dev-python/QtPy/QtPy-1.11.2.ebuild
31 +++ /dev/null
32 @@ -1,158 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=8
37 -
38 -PYTHON_COMPAT=( python3_{8..10} )
39 -
40 -inherit distutils-r1 virtualx
41 -
42 -DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
43 -HOMEPAGE="https://github.com/spyder-ide/qtpy/"
44 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
45 -
46 -LICENSE="MIT"
47 -SLOT="0"
48 -KEYWORDS="amd64 ~arm arm64 x86"
49 -
50 -_IUSE_QT_MODULES="
51 - declarative designer gui help location multimedia network opengl
52 - positioning printsupport sensors serialport speech sql svg testlib
53 - webchannel webengine websockets widgets x11extras xml xmlpatterns
54 -"
55 -IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
56 -unset _IUSE_QT_MODULES
57 -
58 -# PySide2 does not support python3_10, nor is it likely that it will in the
59 -# future since upstream appears to be focussing on PySide6 for Qt6 instead
60 -# (which is compatible with python3_10). So if we want to use python3_10
61 -# we have to force disable pyside2.
62 -REQUIRED_USE="
63 - || ( pyqt5 pyside2 )
64 - python_targets_python3_10? ( pyqt5 !pyside2 )
65 -"
66 -
67 -# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
68 -# Disable them for now, please check periodically if this is still up to date.
69 -# bluetooth? ( pyqt5 )
70 -# dbus? ( pyqt5 )
71 -#
72 -# 3d? ( pyside2 )
73 -# charts? ( pyside2 )
74 -# concurrent? ( pyside2 )
75 -# datavis? ( pyside2 )
76 -# scxml? ( pyside2 )
77 -# script? ( pyside2 )
78 -# scripttools? ( pyside2 )
79 -
80 -# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
81 -# to work. The package only checks whether PyQt5/pyside2 is installed, it does
82 -# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
83 -#
84 -# Webengine is a special case, because PyQt5 provides this in a separate package
85 -# while PySide2 ships it in the same package.
86 -#
87 -# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
88 -# for qml and quick in one flag: declarative PySide2 does not.
89 -#
90 -# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
91 -# added anyway with a (+) to make it future proof if the ebuild were to change
92 -# this behaviour in the future.
93 -#
94 -# The PySide2 ebuild currently enables opengl and serialport support
95 -# unconditionally, the flag is added anyway with a (+) to make it future proof
96 -# if the ebuild were to change this behaviour in the future.
97 -RDEPEND="
98 - pyqt5? (
99 - dev-python/PyQt5[${PYTHON_USEDEP}]
100 - dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
101 - dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
102 - dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
103 - dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
104 - dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
105 - webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
106 - )
107 - pyside2? (
108 - $(python_gen_cond_dep '
109 - dev-python/pyside2[${PYTHON_USEDEP}]
110 - dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
111 - dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
112 - dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
113 - dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
114 - dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
115 - declarative? ( dev-python/pyside2[qml,quick] )
116 - ' python3_{7..9} )
117 - )
118 -"
119 -
120 -# The QtPy testsuite skips tests for bindings that are not installed, so here we
121 -# ensure that everything is available and all tests are run. Note that not
122 -# all flags are available in PyQt5/PySide2, so some tests are still skipped.
123 -BDEPEND="
124 - test? (
125 - dev-python/mock[${PYTHON_USEDEP}]
126 - pyqt5? (
127 - dev-python/PyQt5[${PYTHON_USEDEP}]
128 - dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
129 - dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
130 - dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
131 - dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
132 - dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
133 - )
134 - pyside2? (
135 - $(python_gen_cond_dep '
136 - dev-python/pyside2[${PYTHON_USEDEP}]
137 - dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
138 - dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
139 - dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
140 - dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
141 - dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
142 - dev-python/pyside2[xml,xmlpatterns]
143 - ' python3_{7..9} )
144 - )
145 - )
146 -"
147 -
148 -distutils_enable_tests pytest
149 -
150 -src_prepare() {
151 - default
152 - # Disale Qt for Python implementations that are not selected
153 - if ! use pyqt5; then
154 - sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
155 - fi
156 - if ! use pyside2; then
157 - sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
158 - sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
159 - fi
160 -
161 - # Disable outdated PyQt4 and PySide
162 - sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
163 - sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
164 - sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
165 - sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
166 -}
167 -
168 -src_test() {
169 - virtx python_foreach_impl python_test
170 -}
171 -
172 -python_test() {
173 - if use pyqt5; then
174 - QT_API="pyqt5" epytest
175 - fi
176 - if use pyside2; then
177 - if [[ "${EPYTHON}" == "python3.10" ]]; then
178 - return
179 - else
180 - QT_API="pyside2" epytest
181 - fi
182 - fi
183 -}
184 -
185 -pkg_postinst() {
186 - if use pyqt5 && use pyside2; then
187 - ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
188 - ewarn "to PyQt5 unless the QT_API environment variable overrides this."
189 - fi
190 -}
191
192 diff --git a/dev-python/QtPy/QtPy-1.11.3-r1.ebuild b/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
193 deleted file mode 100644
194 index 56716c7509d2..000000000000
195 --- a/dev-python/QtPy/QtPy-1.11.3-r1.ebuild
196 +++ /dev/null
197 @@ -1,139 +0,0 @@
198 -# Copyright 1999-2021 Gentoo Authors
199 -# Distributed under the terms of the GNU General Public License v2
200 -
201 -EAPI=8
202 -
203 -PYTHON_COMPAT=( python3_{8..10} )
204 -
205 -inherit distutils-r1 virtualx
206 -
207 -DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
208 -HOMEPAGE="https://github.com/spyder-ide/qtpy/"
209 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
210 -
211 -LICENSE="MIT"
212 -SLOT="0"
213 -KEYWORDS="~amd64 ~arm ~arm64 ~x86"
214 -
215 -_IUSE_QT_MODULES="
216 - declarative designer gui help location multimedia network opengl
217 - positioning printsupport sensors serialport speech sql svg testlib
218 - webchannel webengine websockets widgets x11extras xml xmlpatterns
219 -"
220 -IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
221 -unset _IUSE_QT_MODULES
222 -
223 -REQUIRED_USE="|| ( pyqt5 pyside2 )"
224 -
225 -# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
226 -# Disable them for now, please check periodically if this is still up to date.
227 -# bluetooth? ( pyqt5 )
228 -# dbus? ( pyqt5 )
229 -#
230 -# 3d? ( pyside2 )
231 -# charts? ( pyside2 )
232 -# concurrent? ( pyside2 )
233 -# datavis? ( pyside2 )
234 -# scxml? ( pyside2 )
235 -# script? ( pyside2 )
236 -# scripttools? ( pyside2 )
237 -
238 -# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
239 -# to work. The package only checks whether PyQt5/pyside2 is installed, it does
240 -# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
241 -#
242 -# Webengine is a special case, because PyQt5 provides this in a separate package
243 -# while PySide2 ships it in the same package.
244 -#
245 -# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
246 -# for qml and quick in one flag: declarative PySide2 does not.
247 -#
248 -# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
249 -# added anyway with a (+) to make it future proof if the ebuild were to change
250 -# this behaviour in the future.
251 -#
252 -# The PySide2 ebuild currently enables opengl and serialport support
253 -# unconditionally, the flag is added anyway with a (+) to make it future proof
254 -# if the ebuild were to change this behaviour in the future.
255 -RDEPEND="
256 - pyqt5? (
257 - dev-python/PyQt5[${PYTHON_USEDEP}]
258 - dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
259 - dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
260 - dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
261 - dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
262 - dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
263 - webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
264 - )
265 - pyside2? (
266 - dev-python/pyside2[${PYTHON_USEDEP}]
267 - dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
268 - dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
269 - dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
270 - dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
271 - dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
272 - declarative? ( dev-python/pyside2[qml,quick] )
273 - )
274 -"
275 -
276 -# The QtPy testsuite skips tests for bindings that are not installed, so here we
277 -# ensure that everything is available and all tests are run. Note that not
278 -# all flags are available in PyQt5/PySide2, so some tests are still skipped.
279 -BDEPEND="
280 - test? (
281 - dev-python/mock[${PYTHON_USEDEP}]
282 - pyqt5? (
283 - dev-python/PyQt5[${PYTHON_USEDEP}]
284 - dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
285 - dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
286 - dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
287 - dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
288 - dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
289 - )
290 - pyside2? (
291 - dev-python/pyside2[${PYTHON_USEDEP}]
292 - dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
293 - dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
294 - dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
295 - dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
296 - dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
297 - dev-python/pyside2[xml,xmlpatterns]
298 - )
299 - )
300 -"
301 -
302 -distutils_enable_tests pytest
303 -
304 -src_prepare() {
305 - default
306 - # Disale Qt for Python implementations that are not selected
307 - if ! use pyqt5; then
308 - sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
309 - fi
310 - if ! use pyside2; then
311 - sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
312 - sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
313 - fi
314 -
315 - # Disable outdated PyQt4 and PySide
316 - sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
317 - sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
318 - sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
319 - sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
320 -}
321 -
322 -python_test() {
323 - if use pyqt5; then
324 - virtx QT_API="pyqt5" epytest
325 - fi
326 - if use pyside2; then
327 - virtx QT_API="pyside2" epytest
328 - fi
329 -}
330 -
331 -pkg_postinst() {
332 - if use pyqt5 && use pyside2; then
333 - ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
334 - ewarn "to PyQt5 unless the QT_API environment variable overrides this."
335 - fi
336 -}