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/cssutils/files/, dev-python/cssutils/
Date: Sat, 26 Mar 2022 18:05:51
Message-Id: 1648317886.f400d8a914927bc1c2dec3c0bf0cbc9656a45817.arthurzam@gentoo
1 commit: f400d8a914927bc1c2dec3c0bf0cbc9656a45817
2 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 26 18:00:38 2022 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 26 18:04:46 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f400d8a9
7
8 dev-python/cssutils: drop 2.3.0
9
10 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
11
12 dev-python/cssutils/Manifest | 1 -
13 dev-python/cssutils/cssutils-2.3.0.ebuild | 40 ----------------------
14 .../cssutils/files/cssutils-2.3.0-fix-py3.10.patch | 21 ------------
15 .../cssutils/files/cssutils-2.3.0-fix-py3.8.patch | 30 ----------------
16 4 files changed, 92 deletions(-)
17
18 diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
19 index 8c06275cb14e..b6d1a8cde68e 100644
20 --- a/dev-python/cssutils/Manifest
21 +++ b/dev-python/cssutils/Manifest
22 @@ -1,2 +1 @@
23 -DIST cssutils-2.3.0.tar.gz 725849 BLAKE2B 7c6f0280c24eb9cf8c6e4215fc6a102ea0b1f72f52b06d8396601a19ffe457fa628bbf5b9f6c020185378ddf26c96e4aec11026e686343513db9141c7ca22dfd SHA512 9919224a61222e860a99ec80e6375a472b89c52af72272c1de7bcd5fd31cf8570a04da7762c62a17a85bef2c41b1c67447583087df4c86c1f8969ad4875a76d2
24 DIST cssutils-2.4.0.tar.gz 725986 BLAKE2B 2f8d0166288e3af1f838fec3443293b4166bab6e2e115e198f3e6f7a0ec0949262de77eaeebe7437b3cf27567780f988884ce1225b94c379cabddcae0fe10543 SHA512 53e18f9d06905dbda5382a3ed6ef1808571e8a32204864364b0a344e641c774f0998bf23ad0997b34ddbe9f04d3d2c7d622249cfeb0a9e846f7fb1530ae9b12b
25
26 diff --git a/dev-python/cssutils/cssutils-2.3.0.ebuild b/dev-python/cssutils/cssutils-2.3.0.ebuild
27 deleted file mode 100644
28 index 77df7eba3da9..000000000000
29 --- a/dev-python/cssutils/cssutils-2.3.0.ebuild
30 +++ /dev/null
31 @@ -1,40 +0,0 @@
32 -# Copyright 1999-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=8
36 -
37 -PYTHON_COMPAT=( python3_{8..10} )
38 -inherit distutils-r1
39 -
40 -DESCRIPTION="A CSS Cascading Style Sheets library"
41 -HOMEPAGE="https://pypi.org/project/cssutils/ https://cthedot.de/cssutils/"
42 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
43 -
44 -LICENSE="GPL-3"
45 -SLOT="0"
46 -KEYWORDS="amd64 arm arm64 ppc x86"
47 -
48 -BDEPEND="
49 - dev-python/setuptools_scm[${PYTHON_USEDEP}]
50 - test? (
51 - dev-python/cssselect[${PYTHON_USEDEP}]
52 - dev-python/lxml[${PYTHON_USEDEP}]
53 - dev-python/mock[${PYTHON_USEDEP}]
54 - $(python_gen_cond_dep '
55 - dev-python/importlib_resources[${PYTHON_USEDEP}]
56 - ' python3_8 pypy3)
57 - )"
58 -
59 -PATCHES=(
60 - "${FILESDIR}/${P}-fix-py3.8.patch"
61 - "${FILESDIR}/${P}-fix-py3.10.patch"
62 -)
63 -
64 -distutils_enable_tests pytest
65 -
66 -EPYTEST_DESELECT=(
67 - # network
68 - encutils/__init__.py::encutils
69 - cssutils/tests/test_parse.py::CSSParserTestCase::test_parseUrl
70 - examples/website.py::website.logging
71 -)
72
73 diff --git a/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.10.patch b/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.10.patch
74 deleted file mode 100644
75 index 540fc7a1cc03..000000000000
76 --- a/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.10.patch
77 +++ /dev/null
78 @@ -1,21 +0,0 @@
79 -From: Arthur Zamarin <arthurzam@×××××.com>
80 -Date: Fri, 22 Oct 2021 17:48:28 +0300
81 -Subject: [PATCH] Fix expected error message for python 3.10
82 -
83 -python 3.10 adds some words to it's errors, so catch if our expected
84 -are contained in the actual output
85 -
86 -Signed-off-by: Arthur Zamarin <arthurzam@×××××.com>
87 -https://github.com/jaraco/cssutils/pull/17
88 -
89 ---- a/cssutils/tests/basetest.py
90 -+++ b/cssutils/tests/basetest.py
91 -@@ -126,7 +126,7 @@ class BaseTestCase(unittest.TestCase):
92 - if not msg:
93 - # No message provided: any message is fine.
94 - return
95 -- elif excMsg == msg:
96 -+ elif msg in excMsg:
97 - # Message provided, and we got the right message: passes.
98 - return
99 - else:
100
101 diff --git a/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.8.patch b/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.8.patch
102 deleted file mode 100644
103 index a3fff246b616..000000000000
104 --- a/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.8.patch
105 +++ /dev/null
106 @@ -1,30 +0,0 @@
107 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
108 -Date: Mon, 24 May 2021 08:35:13 +0200
109 -Subject: [PATCH] Force using importlib_resources in Python < 3.9
110 -
111 -Force using the external importlib_resources package based on Python
112 -version rather than the presence of the built-in importlib.resources.
113 -The latter does not have the needed files() method in Python < 3.9,
114 -and therefore results in test failures:
115 -
116 - E AttributeError: module 'importlib.resources' has no attribute 'files'
117 -
118 -This affects specifically Python 3.7 and 3.8 that have an older version
119 -of importlib.resources module.
120 -
121 -https://github.com/jaraco/cssutils/pull/10
122 -
123 ---- a/cssutils/tests/basetest.py
124 -+++ b/cssutils/tests/basetest.py
125 -@@ -6,9 +6,9 @@
126 - import sys
127 - import unittest
128 -
129 --try:
130 -+if sys.version_info >= (3, 9):
131 - from importlib import resources
132 --except ImportError:
133 -+else:
134 - import importlib_resources as resources
135 -
136 - import cssutils