1 |
commit: b265f17bc2d3a58b311c073acb48fd49527e5332 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 7 15:37:56 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 7 15:37:56 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b265f17b |
7 |
|
8 |
dev-python/cssutils: Remove redundant versions |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/cssutils/Manifest | 1 - |
13 |
dev-python/cssutils/cssutils-1.0.1.ebuild | 55 ---------------------- |
14 |
dev-python/cssutils/cssutils-1.0.2-r1.ebuild | 55 ---------------------- |
15 |
.../files/cssutils-1.0.1-pypy-test-backport.patch | 32 ------------- |
16 |
4 files changed, 143 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest |
19 |
index e9f838eecc6..23b7b70e68a 100644 |
20 |
--- a/dev-python/cssutils/Manifest |
21 |
+++ b/dev-python/cssutils/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST cssutils-1.0.1.tar.gz 353621 BLAKE2B 142320e2358acb1b5b95400f42fb5eb40840602bd204f68a1896ea92b35dfe2ce6f316d84cf5d21a2ef8047f4748294b908057fa12cab352b42d7ab2ffcfaa6f SHA512 932a128443cc31f689d91c7c75a04ddc79824b4e5c0779e48d30fa0a3a760cad82d8208264ec95a3b120c38962f2eabf6b3456aa8f81d24e9c9718e95fd6bf83 |
24 |
DIST cssutils-1.0.2.tar.gz 367038 BLAKE2B e19edce100dbc05d6e469eb6b0ad234d7d4c9458aca1b2a3e72bdeff1a35dec64427353936a339e2071d8ba2e8804c5754f55a391955a61ef61ae56381269125 SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda |
25 |
|
26 |
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild |
27 |
deleted file mode 100644 |
28 |
index f3e9e622067..00000000000 |
29 |
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,55 +0,0 @@ |
32 |
-# Copyright 1999-2020 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=5 |
36 |
- |
37 |
-PYTHON_COMPAT=( python3_6 ) |
38 |
- |
39 |
-inherit distutils-r1 |
40 |
- |
41 |
-DESCRIPTION="A CSS Cascading Style Sheets library" |
42 |
-HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/" |
43 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="GPL-3" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="amd64 arm ppc x86" |
48 |
-IUSE="test" |
49 |
-RESTRICT="!test? ( test )" |
50 |
- |
51 |
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
52 |
-DEPEND="${RDEPEND} |
53 |
- test? ( |
54 |
- dev-python/mock[${PYTHON_USEDEP}] |
55 |
- dev-python/nose[${PYTHON_USEDEP}] |
56 |
- )" |
57 |
- |
58 |
-PATCHES=( |
59 |
- "${FILESDIR}"/${P}-pypy-test-backport.patch |
60 |
-) |
61 |
- |
62 |
-python_prepare_all() { |
63 |
- # Disable test failing with dev-python/pyxml installed. |
64 |
- if has_version dev-python/pyxml; then |
65 |
- sed -e "s/test_linecol/_&/" -i src/tests/test_errorhandler.py |
66 |
- fi |
67 |
- |
68 |
- # requires old pbr, does it really? |
69 |
- sed \ |
70 |
- -e '/tests_require/d' \ |
71 |
- -i setup.py || die |
72 |
- |
73 |
- EPATCH_OPTS="--binary" |
74 |
- |
75 |
- distutils-r1_python_prepare_all |
76 |
-} |
77 |
- |
78 |
-python_test() { |
79 |
- ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die |
80 |
- # esetup.py test |
81 |
- # exclude tests that connect to the network |
82 |
- set -- nosetests \ |
83 |
- -e test_parseUrl -e test_handlers -P "${BUILD_DIR}/lib/cssutils/tests" |
84 |
- echo "$@" |
85 |
- "$@" || die "Testing failed with ${EPYTHON}" |
86 |
-} |
87 |
|
88 |
diff --git a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild |
89 |
deleted file mode 100644 |
90 |
index 4c06df2a752..00000000000 |
91 |
--- a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild |
92 |
+++ /dev/null |
93 |
@@ -1,55 +0,0 @@ |
94 |
-# Copyright 1999-2020 Gentoo Authors |
95 |
-# Distributed under the terms of the GNU General Public License v2 |
96 |
- |
97 |
-EAPI=7 |
98 |
- |
99 |
-PYTHON_COMPAT=( python3_{6,7} ) |
100 |
- |
101 |
-inherit distutils-r1 |
102 |
- |
103 |
-DESCRIPTION="A CSS Cascading Style Sheets library" |
104 |
-HOMEPAGE="https://pypi.org/project/cssutils/ https://bitbucket.org/cthedot/cssutils http://cthedot.de/cssutils/" |
105 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
106 |
- |
107 |
-LICENSE="GPL-3" |
108 |
-SLOT="0" |
109 |
-KEYWORDS="amd64 ~arm arm64 ~ppc ~x86" |
110 |
-IUSE="test" |
111 |
-RESTRICT="!test? ( test )" |
112 |
- |
113 |
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
114 |
-DEPEND="${RDEPEND} |
115 |
- test? ( |
116 |
- dev-python/mock[${PYTHON_USEDEP}] |
117 |
- dev-python/nose[${PYTHON_USEDEP}] |
118 |
- )" |
119 |
- |
120 |
-python_prepare_all() { |
121 |
- # Disable test failing with dev-python/pyxml installed. |
122 |
- if has_version dev-python/pyxml; then |
123 |
- sed -e "s/test_linecol/_&/" \ |
124 |
- -i src/cssutils/tests/test_errorhandler.py \ |
125 |
- || die |
126 |
- fi |
127 |
- |
128 |
- # requires old pbr, does it really? |
129 |
- sed \ |
130 |
- -e '/tests_require/d' \ |
131 |
- -i setup.py || die |
132 |
- |
133 |
- # fix casing of call to Windows-1252. Remove when upstream fixes casing. |
134 |
- sed -i -e 's/encutils.tryEncodings(test)/encutils.tryEncodings(test).lower()/' \ |
135 |
- src/cssutils/tests/test_encutils/__init__.py || die "fixing test_encutils failed" |
136 |
- |
137 |
- distutils-r1_python_prepare_all |
138 |
-} |
139 |
- |
140 |
-python_test() { |
141 |
- ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die |
142 |
- # esetup.py test |
143 |
- # exclude tests that connect to the network |
144 |
- set -- nosetests \ |
145 |
- -e test_parseUrl -e test_handlers -P "${BUILD_DIR}/lib/cssutils/tests" |
146 |
- echo "$@" |
147 |
- "$@" || die "Testing failed with ${EPYTHON}" |
148 |
-} |
149 |
|
150 |
diff --git a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch |
151 |
deleted file mode 100644 |
152 |
index f5f1bda3516..00000000000 |
153 |
--- a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch |
154 |
+++ /dev/null |
155 |
@@ -1,32 +0,0 @@ |
156 |
-# HG changeset patch |
157 |
-# User Daniel <kingdread@×××.de> |
158 |
-# Date 1448482419 -3600 |
159 |
-# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d |
160 |
-# Parent 3a01bd18118a6466ad93aa23caaa4164528b59ac |
161 |
-Fix tests on PyPy 2 |
162 |
- |
163 |
-Tests fail because of the extra "u" prefix in the error message |
164 |
- |
165 |
-diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py |
166 |
---- a/src/cssutils/tests/test_profiles.py |
167 |
-+++ b/src/cssutils/tests/test_profiles.py |
168 |
-@@ -2,6 +2,7 @@ |
169 |
- __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $' |
170 |
- |
171 |
- import sys |
172 |
-+import platform |
173 |
- import basetest |
174 |
- import cssutils |
175 |
- |
176 |
-@@ -124,6 +125,11 @@ |
177 |
- expmsg = u"invalid literal for int(): x" |
178 |
- elif sys.platform.startswith('java'): |
179 |
- expmsg = u"invalid literal for int() with base 10: x" |
180 |
-+ # PyPy adds the u prefix, but only in versions lower than Python 3 |
181 |
-+ elif (platform.python_implementation() == "PyPy" and |
182 |
-+ sys.version_info < (3, 0)): |
183 |
-+ expmsg = u"invalid literal for int() with base 10: u'x'" |
184 |
-+ |
185 |
- |
186 |
- self.assertRaisesMsg(Exception, expmsg, |
187 |
- cssutils.profile.validate, u'-test-funcval', u'x') |