commit: f2286a8c1805e2f52bcbadec5125cd77e70cff33 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Jan 9 07:02:55 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Jan 9 08:08:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2286a8c
dev-python/lxml: Bump to 5.1.0 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/lxml/Manifest | 1 + dev-python/lxml/files/lxml-5.1.0-pypy.patch | 175 ++++++++++++++++++++++++++++ dev-python/lxml/lxml-5.1.0.ebuild | 117 +++++++++++++++++++ 3 files changed, 293 insertions(+) diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest index 5819c17b57cb..01eaf3ac743a 100644 --- a/dev-python/lxml/Manifest +++ b/dev-python/lxml/Manifest @@ -3,3 +3,4 @@ DIST lxml-4.9.3.gh.tar.gz 958628 BLAKE2B ffdf3fe781a03815f7c026229d313721c93375e DIST lxml-4.9.4.gh.tar.gz 960009 BLAKE2B 7d31095dcf1f73c1026e7378e6adb19a053edc116b119ae415c3324134d3700822bf4611dc3cbf7c216d396e1404b143c8ebfdfb7e5a71b9ef6ec187898cc699 SHA512 528ef4ae057a7ee54d3193a042a6db500ada883d1d506829b6824d91ec979feb69ec79239420112eae0e08a437b2e5da8efc35feb5d04d119bfae2679e918d29 DIST lxml-5.0.0.gh.tar.gz 964278 BLAKE2B 9c3f026b03bd671545cb039632af9bf1e8b94b8f8d4a20d0e4110f2b2d63cf0a46f983d0fa8eb71867ba9ac8cd46c949714dc7486faf01ecedae858e39799031 SHA512 6562bb68ea677fd9726adff1940034e364be0626dd1c086971cf0b271ca5caf98c96a3c465b98ede76f72248a40cf190fdc4f54c04c7e9c93e6408fde63fbfd3 DIST lxml-5.0.1.gh.tar.gz 965422 BLAKE2B 4dfc17a0d3920a6785765f7bf5a35b578c8e62419ce6b5288a2899fcbf8b809a235a9b3b23abbcfa84ba5fcabb9ce7a838ff02f3f74e4ae5cb60850b951e3c23 SHA512 09ed4d9fd1396a0fbc2d7b14119545817497a85e632fde6239f6e66921926476e468a9ced227b6575519a2d1a5d03c858319386a5d739ff7aa3f68282d027b63 +DIST lxml-5.1.0.gh.tar.gz 962111 BLAKE2B 31c82eb198911d82fd9f7882bf94547b2367f3b3d1183eb8e8f97297b96faa69230d27b3367160b1f732a5d0878296b2d11787c3b220416c81a920e62ebec4f2 SHA512 1fadfeac1fb8b1e4fb1f7f2acb056865eb2567300a6c728eaede380d846ac75a6e33ebebcbbc6d60f54102152afd5dddf970058c4e27af396e9fa58e83c407a7 diff --git a/dev-python/lxml/files/lxml-5.1.0-pypy.patch b/dev-python/lxml/files/lxml-5.1.0-pypy.patch new file mode 100644 index 000000000000..7b50b9d3062c --- /dev/null +++ b/dev-python/lxml/files/lxml-5.1.0-pypy.patch @@ -0,0 +1,175 @@ +diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py +index fa735c28..9337bc04 100644 +--- a/src/lxml/tests/test_errors.py ++++ b/src/lxml/tests/test_errors.py +@@ -10,3 +10,3 @@ from lxml import etree + +-from .common_imports import HelperTestCase ++from .common_imports import HelperTestCase, IS_PYPY + +@@ -24,2 +24,3 @@ class ErrorTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_element_cyclic_gc_none(self): +diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py +index 8385e393..0b259299 100644 +--- a/src/lxml/tests/test_http_io.py ++++ b/src/lxml/tests/test_http_io.py +@@ -10,3 +10,3 @@ import gzip + +-from .common_imports import etree, HelperTestCase, BytesIO, _bytes ++from .common_imports import etree, HelperTestCase, BytesIO, _bytes, IS_PYPY + from .dummy_http_server import webserver, HTTPRequestCollector +@@ -14,2 +14,3 @@ from .dummy_http_server import webserver, HTTPRequestCollector + ++@unittest.skipIf(IS_PYPY, "broken on pypy") + class HttpIOTestCase(HelperTestCase): +diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py +index 750dc1ed..adbec11c 100644 +--- a/src/lxml/tests/test_nsclasses.py ++++ b/src/lxml/tests/test_nsclasses.py +@@ -8,3 +8,3 @@ import unittest + +-from .common_imports import etree, HelperTestCase, _bytes, make_doctest ++from .common_imports import etree, HelperTestCase, _bytes, make_doctest, IS_PYPY + +@@ -45,2 +45,3 @@ class ETreeNamespaceClassesTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_ns_classes(self): +diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py +index 1c8ff47c..326c5316 100644 +--- a/src/lxml/tests/test_objectify.py ++++ b/src/lxml/tests/test_objectify.py +@@ -10,3 +10,4 @@ import unittest + from .common_imports import ( +- etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO ++ etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO, ++ IS_PYPY + ) +@@ -383,2 +384,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_setattr(self): +@@ -818,2 +820,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_build_tree(self): +@@ -847,2 +850,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_bool(self): +@@ -884,2 +888,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str(self): +@@ -891,2 +896,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_intliteral(self): +@@ -898,2 +904,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_floatliteral(self): +@@ -905,2 +912,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_mul(self): +@@ -917,2 +925,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_add(self): +@@ -992,2 +1001,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr(self): +@@ -999,2 +1009,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_intliteral(self): +@@ -1006,2 +1017,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_floatliteral(self): +@@ -1013,2 +1025,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_mul(self): +@@ -1025,2 +1038,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_add(self): +@@ -1050,2 +1064,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_int(self): +@@ -1066,2 +1081,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float(self): +@@ -1082,2 +1098,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float_precision(self): +@@ -1101,2 +1118,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float_precision_consistency(self): +@@ -1187,2 +1205,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_unregistered(self): +@@ -1349,2 +1368,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_cmp(self): +@@ -1376,2 +1396,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_int_cmp(self): +@@ -1398,2 +1419,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_bool_cmp(self): +@@ -2067,2 +2089,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_registered_type_stringify(self): +@@ -2537,2 +2560,3 @@ class ObjectifyTestCase(HelperTestCase): + # type-looked-up as ObjectifiedElement (no annotations) ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_int(self): +@@ -2542,2 +2566,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_float(self): +@@ -2547,2 +2572,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_str(self): +@@ -2552,2 +2578,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_unicode(self): +@@ -2557,2 +2584,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_bool(self): +@@ -2562,2 +2590,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_none(self): +@@ -2567,2 +2596,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_value_concatenation(self): +@@ -2577,2 +2607,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_nested(self): +@@ -2745,3 +2776,4 @@ def test_suite(): + suite.addTests(doctest.DocTestSuite(objectify)) +- suite.addTests([make_doctest('../../../doc/objectify.txt')]) ++ if not IS_PYPY: ++ suite.addTests([make_doctest('../../../doc/objectify.txt')]) + return suite diff --git a/dev-python/lxml/lxml-5.1.0.ebuild b/dev-python/lxml/lxml-5.1.0.ebuild new file mode 100644 index 000000000000..4fdfa9ff57e7 --- /dev/null +++ b/dev-python/lxml/lxml-5.1.0.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 optfeature toolchain-funcs + +DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" +HOMEPAGE=" + https://lxml.de/ + https://pypi.org/project/lxml/ + https://github.com/lxml/lxml/ +" +SRC_URI=" + https://github.com/lxml/lxml/archive/${P}.tar.gz + -> ${P}.gh.tar.gz +" +S=${WORKDIR}/lxml-${P} + +LICENSE="BSD ElementTree GPL-2 PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" + +# Note: lib{xml2,xslt} are used as C libraries, not Python modules. +DEPEND=" + >=dev-libs/libxml2-2.10.3 + >=dev-libs/libxslt-1.1.38 +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + virtual/pkgconfig + >=dev-python/cython-3.0.7[${PYTHON_USEDEP}] + doc? ( + $(python_gen_any_dep ' + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + ) + test? ( + dev-python/cssselect[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/${P}-pypy.patch" +) + +python_check_deps() { + use doc || return 0 + python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" +} + +python_prepare_all() { + # avoid replacing PYTHONPATH in tests. + sed -i -e '/sys\.path/d' test.py || die + + # don't use some random SDK on Darwin + sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \ + setupinfo.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + local DISTUTILS_ARGS=( + # by default it adds -w to CFLAGS + --warnings + ) + tc-export PKG_CONFIG + distutils-r1_python_compile +} + +python_compile_all() { + use doc && emake html +} + +python_test() { + local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml + local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH} + + cp -al "${BUILD_DIR}"/{install,test} || die + cp -al src/lxml/tests "${dir}/" || die + cp -al src/lxml/html/tests "${dir}/html/" || die + ln -rs "${S}"/doc "${dir}"/../../ || die + + "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" +} + +python_install_all() { + if use doc; then + local DOCS=( README.rst *.txt doc/*.txt ) + local HTML_DOCS=( doc/html/. ) + fi + if use examples; then + dodoc -r samples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4 + optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect +}