[gentoo-commits] repo/gentoo:master commit in: dev-python/cssutils/files/, dev-python/cssutils/
commit: f400d8a914927bc1c2dec3c0bf0cbc9656a45817 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 26 18:00:38 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 26 18:04:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f400d8a9 dev-python/cssutils: drop 2.3.0 Signed-off-by: Arthur Zamarin gentoo.org> dev-python/cssutils/Manifest | 1 - dev-python/cssutils/cssutils-2.3.0.ebuild | 40 -- .../cssutils/files/cssutils-2.3.0-fix-py3.10.patch | 21 .../cssutils/files/cssutils-2.3.0-fix-py3.8.patch | 30 4 files changed, 92 deletions(-) diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest index 8c06275cb14e..b6d1a8cde68e 100644 --- a/dev-python/cssutils/Manifest +++ b/dev-python/cssutils/Manifest @@ -1,2 +1 @@ -DIST cssutils-2.3.0.tar.gz 725849 BLAKE2B 7c6f0280c24eb9cf8c6e4215fc6a102ea0b1f72f52b06d8396601a19ffe457fa628bbf5b9f6c020185378ddf26c96e4aec11026e686343513db9141c7ca22dfd SHA512 9919224a61222e860a99ec80e6375a472b89c52af72272c1de7bcd5fd31cf8570a04da7762c62a17a85bef2c41b1c67447583087df4c86c1f8969ad4875a76d2 DIST cssutils-2.4.0.tar.gz 725986 BLAKE2B 2f8d0166288e3af1f838fec3443293b4166bab6e2e115e198f3e6f7a0ec0949262de77eaeebe7437b3cf27567780f94ce1225b94c379cabddcae0fe10543 SHA512 53e18f9d06905dbda5382a3ed6ef1808571e8a32204864364b0a344e641c774f0998bf23ad0997b34ddbe9f04d3d2c7d622249cfeb0a9e846f7fb1530ae9b12b diff --git a/dev-python/cssutils/cssutils-2.3.0.ebuild b/dev-python/cssutils/cssutils-2.3.0.ebuild deleted file mode 100644 index 77df7eba3da9.. --- a/dev-python/cssutils/cssutils-2.3.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -DESCRIPTION="A CSS Cascading Style Sheets library" -HOMEPAGE="https://pypi.org/project/cssutils/ https://cthedot.de/cssutils/; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc x86" - -BDEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - dev-python/cssselect[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/importlib_resources[${PYTHON_USEDEP}] - ' python3_8 pypy3) - )" - -PATCHES=( - "${FILESDIR}/${P}-fix-py3.8.patch" - "${FILESDIR}/${P}-fix-py3.10.patch" -) - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # network - encutils/__init__.py::encutils - cssutils/tests/test_parse.py::CSSParserTestCase::test_parseUrl - examples/website.py::website.logging -) 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 deleted file mode 100644 index 540fc7a1cc03.. --- a/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.10.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Arthur Zamarin -Date: Fri, 22 Oct 2021 17:48:28 +0300 -Subject: [PATCH] Fix expected error message for python 3.10 - -python 3.10 adds some words to it's errors, so catch if our expected -are contained in the actual output - -Signed-off-by: Arthur Zamarin -https://github.com/jaraco/cssutils/pull/17 - a/cssutils/tests/basetest.py -+++ b/cssutils/tests/basetest.py -@@ -126,7 +126,7 @@ class BaseTestCase(unittest.TestCase): - if not msg: - # No message provided: any message is fine. - return --elif excMsg == msg: -+elif msg in excMsg: - # Message provided, and we got the right message: passes. - return - else: 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 deleted file mode 100644 index a3fff246b616.. --- a/dev-python/cssutils/files/cssutils-2.3.0-fix-py3.8.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Mon, 24 May 2021 08:35:13 +0200 -Subject: [PATCH] Force using importlib_resources in Python < 3.9 - -Force using the external importlib_resources package based on Python -version rather than the presence of the built-in importlib.resources. -The latter does not have the needed files() method in Python < 3.9, -and therefore results in test failures: - - E AttributeError: module 'importlib.resources' has no attribute 'files' - -This affects specifically Python 3.7 and 3.8 that have an older version -of importlib.resources module. - -https://github.com/jaraco/cssutils/pull/10 - a/cssutils/tests/basetest.py -+++ b/cssutils/tests/basetest.py -@@ -6,9 +6,9 @@ - import sys - import unittest - --try: -+if sys.version_info
[gentoo-commits] repo/gentoo:master commit in: dev-python/cssutils/files/, dev-python/cssutils/
commit: 560644c4f6e23332c8c972e746ba1f01092821b2 Author: Justin Lecher gentoo org> AuthorDate: Mon Nov 30 14:40:01 2015 + Commit: Justin Lecher gentoo org> CommitDate: Mon Nov 30 14:42:27 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=560644c4 dev-python/cssutils: Clear broken lineendings Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=567160 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/cssutils/cssutils-1.0.1.ebuild | 2 + .../files/cssutils-1.0.1-pypy-test-backport.patch | 64 +++--- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild index c2be49f..d585a63 100644 --- a/dev-python/cssutils/cssutils-1.0.1.ebuild +++ b/dev-python/cssutils/cssutils-1.0.1.ebuild @@ -35,6 +35,8 @@ python_prepare_all() { -e '/tests_require/d' \ -i setup.py || die + EPATCH_OPTS="--binary" + distutils-r1_python_prepare_all } 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 index 89c7608..f5f1bda 100644 --- 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 @@ -1,32 +1,32 @@ -# HG changeset patch -# User Daniel-# Date 1448482419 -3600 -# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d -# Parent 3a01bd18118a6466ad93aa23caaa4164528b59ac -Fix tests on PyPy 2 - -Tests fail because of the extra "u" prefix in the error message - -diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py a/src/cssutils/tests/test_profiles.py -+++ b/src/cssutils/tests/test_profiles.py -@@ -2,6 +2,7 @@ - __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $' - - import sys -+import platform - import basetest - import cssutils - -@@ -124,6 +125,11 @@ - expmsg = u"invalid literal for int(): x" - elif sys.platform.startswith('java'): - expmsg = u"invalid literal for int() with base 10: x" -+# PyPy adds the u prefix, but only in versions lower than Python 3 -+elif (platform.python_implementation() == "PyPy" and -+ sys.version_info < (3, 0)): -+expmsg = u"invalid literal for int() with base 10: u'x'" -+ - - self.assertRaisesMsg(Exception, expmsg, - cssutils.profile.validate, u'-test-funcval', u'x') +# HG changeset patch +# User Daniel +# Date 1448482419 -3600 +# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d +# Parent 3a01bd18118a6466ad93aa23caaa4164528b59ac +Fix tests on PyPy 2 + +Tests fail because of the extra "u" prefix in the error message + +diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py +--- a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py +@@ -2,6 +2,7 @@ + __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $' + + import sys ++import platform + import basetest + import cssutils + +@@ -124,6 +125,11 @@ + expmsg = u"invalid literal for int(): x" + elif sys.platform.startswith('java'): + expmsg = u"invalid literal for int() with base 10: x" ++# PyPy adds the u prefix, but only in versions lower than Python 3 ++elif (platform.python_implementation() == "PyPy" and ++ sys.version_info < (3, 0)): ++expmsg = u"invalid literal for int() with base 10: u'x'" ++ + + self.assertRaisesMsg(Exception, expmsg, + cssutils.profile.validate, u'-test-funcval', u'x')