From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- dev-python/lxml/Manifest | 13 +- dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch | 415 ++++++++++++++++++++++ dev-python/lxml/lxml-4.2.5.ebuild | 1 + dev-python/lxml/lxml-4.3.3.ebuild | 1 + dev-python/lxml/lxml-4.3.4.ebuild | 1 + dev-python/lxml/lxml-4.4.0.ebuild | 1 + dev-python/lxml/lxml-4.4.1.ebuild | 3 +- dev-python/lxml/lxml-4.4.2.ebuild | 82 +++++ 8 files changed, 511 insertions(+), 6 deletions(-) create mode 100644 dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch create mode 100644 dev-python/lxml/lxml-4.4.2.ebuild (limited to 'dev-python/lxml') diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest index 3309f5e9e1e3..656aa9fa9767 100644 --- a/dev-python/lxml/Manifest +++ b/dev-python/lxml/Manifest @@ -1,12 +1,15 @@ AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b +AUX lxml-4.4.2-tests-pypy.patch 17078 BLAKE2B 2dc3bc4f8b1de65f3b287d921880e2632cf3268b0e944846cd641903b382a0065d820093448069fbea318a3bf181b375a441dbf8aa903f0ee71f2ae819358adf SHA512 9a5c021b8cc2cd6cd4a609adb858e582172675aa5bc106ce03f88da95c71d7b2afc04394728e8297b316f6312d338f170a87b4937cda78d78c56e80a3308e3f5 DIST lxml-4.2.5.tar.gz 4414081 BLAKE2B c1c75a0a0c33011e2becb729de2c15dd786dd12bddeba4f2f26032d0d17104f258b471f5f961cbf96340df66cbce3e874d7a16c59731af280a309132b669d1b9 SHA512 4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe DIST lxml-4.3.3.tar.gz 4378439 BLAKE2B 30c2a29e58951164fbff1c9d23362d46987c86b671e0cfa6cf15cbbb3db23ead856786babe57ce553f7b8a66d8ac333410ea1bb3b8b521aac43a038b90daf488 SHA512 cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0 DIST lxml-4.3.4.tar.gz 2488557 BLAKE2B 5059ea45d3d833955636216a7c096322496882de4592a0d19604885dca8dffbc763afb7dc804b7a34561d0c94dfa2130a61835d6c12b97dc83008e8fa33e098a SHA512 7349cb4805e538da5b11edcb79fcd09ddedf0d52e50273a4e587f209e6b147b50737c45dcfc8eb3ee8e7be8f99769046f704c5fc8c35cee74d5d22ef72d503ed DIST lxml-4.4.0.tar.gz 939001 BLAKE2B 9fc473729286e98cd73e4b39d7acf22ccb957dd4b366924dc171a6c89c2e435a3dae771342eb3b143451b0550960cb821430de3e8f6470dc87e3a85efc389314 SHA512 23e7b5157a6520f3e1dab76b023e828a5afe9d0103e2d3ff8fd1a8791000ed8f859e26fe9809676b89d4ef9fa4b27a6f1662a2b0f54e5ae04776643f5b06c0c3 DIST lxml-4.4.1.tar.gz 939355 BLAKE2B 0e9ebc894ebaa7994ee7ce1491683ff892ceac5dbae6bd90fd4d5ac04ec59d6c85edba37160a605c8c1b38119cdccdc8b97b62dc43f76705d7ebb595410c666c SHA512 08857f5e15d6b4badb8bea96fc7aaf3a02a504f9b87171e01c6ace25250d254691c64661dca8e723824cabac4753c59ffa667ac0b6042506b05e4357389e658c -EBUILD lxml-4.2.5.ebuild 2326 BLAKE2B 46e89c6652bc410054fafb2fe37e3d5b540e1189042707cf87f0692fe410f4c30e97c23392b949ec6ef7be89e2b871d079f350bf1324d074492b714370e673f7 SHA512 5aa5c607bafe22bb16834fe795b7cf4d51c3d0e8c41e8fdd597988923c7b7037c7fb4c93188707a53df32efbe5812738a7cc50ffc7e5bc6bd34355f2ba033e5a -EBUILD lxml-4.3.3.ebuild 2416 BLAKE2B 0be377482f12adfca930655c828c2fe45e4f758389b90573be52a5658c5da0d11ef7827c834324b1408676819933680925a635c4b0cf99e45506329dfc73a982 SHA512 1a486e9cf4c8fc6cafef366b4af6268fb2f399666a92b53d4057477e2225d398df839cdca7c705d1b3349cf0b447baf0a69ba8da038ac05158b64e8b5ce8207c -EBUILD lxml-4.3.4.ebuild 2427 BLAKE2B 131b287e2b6bd728a648b275850ecd96fe9cd67b5ff9a26fef2cd26bb428c4dae3dceb5422d58188f6c2941b7098b121533254be28611467cbf1cb77f2f3d6e5 SHA512 12eb2d15645f428315324731dab32de2a252de46018e249465e689ffe75dfe7b331cdab416c636c239f896f714f9fd115e93bd999b954c5c4254413488fd945a -EBUILD lxml-4.4.0.ebuild 2275 BLAKE2B 906dc0eb0a5fd82f2dbbe253202e0f6696831fc6013d8bf1a3a7e93e268fd5740ebbb78c46bb96003fb62b15807cfaf7641c266ba8fa12bd880609ea18e883be SHA512 5a70c4b53199a1b25ce7ade08b241aeeefe32ae27f1619e7fefa417128106685d856b925439108832978c1bce20469226107b91d5f7d53279c8987e0745271bb -EBUILD lxml-4.4.1.ebuild 2275 BLAKE2B 906dc0eb0a5fd82f2dbbe253202e0f6696831fc6013d8bf1a3a7e93e268fd5740ebbb78c46bb96003fb62b15807cfaf7641c266ba8fa12bd880609ea18e883be SHA512 5a70c4b53199a1b25ce7ade08b241aeeefe32ae27f1619e7fefa417128106685d856b925439108832978c1bce20469226107b91d5f7d53279c8987e0745271bb +DIST lxml-4.4.2.tar.gz 940286 BLAKE2B 28366d1673b356f980cedc64839f070e8166906705bc948af24bba369153accc0a4cea0372e87530227be88a89a0dab4d23308b75fd695f55fdb73e6326aa03b SHA512 af6608df7e47513644b841ecb6291e655122927cb439bd2ae694fd344cf5dca621e3e1ce6b40accc6db9e0c4383b5b3e6c6f9ff19f35c4daf30f119a217113ca +EBUILD lxml-4.2.5.ebuild 2353 BLAKE2B d55f666417be498640c5e3224fd9745bd00eb0da8fe5179ca398760d2075f6bf73052843e6e04e2afd7c2dd8aa3053c3fe3f172db6f26165a0dbec19b1006699 SHA512 072955757052fe5aa4d261c0e51563f2e4923d188f5e68e1ef216cb248597b56df90cd4a919c52b20207eb4f5aa3dd6f993c5a71319fb6ae187aea339c7052dc +EBUILD lxml-4.3.3.ebuild 2443 BLAKE2B fa028529d2abec36bbdafe49918e4bb30aaa31f77c419cc6bb9f12713e46040d182671614bcd01c4ab60fa0c469bb823d1060734e4a3836410a421d4ef7c2c8d SHA512 ff75b9aafc904a8ec4b6306617fa32f7b928c6b6b8a170cf25ee0625b3335337fe5ff4902c8e663f6110b6def0ffa5ef30e4089c93522d9ea882ea755fba03de +EBUILD lxml-4.3.4.ebuild 2454 BLAKE2B 3f222e378df513801962f4405d76a1ca1c9024dd2437933144f5931856636891c2044f29b15eb13da5777376905227a88566d652329e7a1c18e693b3e0d49e54 SHA512 73275c268e272719f8bcf083422c298f27c20b3516b13d066ba75023e43dfe8e3953775155be562e3627df0ff024e7d4195fcf9216fb262869ffc3c4412a1fe5 +EBUILD lxml-4.4.0.ebuild 2302 BLAKE2B c4f639087c3e3d6458c989238f11a8c163afb9aa00882c5581b68a3375c3d73f7441c3e0fdfa89f7469440316baa5a528517b9a0845e866b373134d93ed6edee SHA512 ad3955342b4b3bac0eb1bf938ee0980351a03214a1c71deff6a8830eb769d17470e4860b029f3f26c232b8bb2cb505459292b847e0e265e70544185babb6bd8d +EBUILD lxml-4.4.1.ebuild 2304 BLAKE2B 987454bcff0b2383a915429195c64e6c1f33eefaddd19b4e5fc646991b3e5df8b9928fd5ae60eb1ecaeaf63a7aa106ce65f497cf41b5edba2b806719b6825662 SHA512 fc82baa0f984db6f43cbffbcfa09b115c91df050f3042ccb22a2bb2e52aac02bd2bddfda50ccb01375c2a0aacd0f4a8c27e8afd37eeda2d7bca4b0442d087d3e +EBUILD lxml-4.4.2.ebuild 2352 BLAKE2B d4199978bcbe6ba823e8bfd5c8b81bff254ea62a839255cd1e5d1af366791e806822be8c38ad671be311f2b40b26ae3a85253237e5095271766ece3366cf2b4d SHA512 7ce64da44e7c6d501c2b5f0bcc5f51f6d6518a10bb264a5e951514079a1c64ec6fec541a749f45310b98c2485af81b1defa579d003b69554ea0045256175ac99 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae diff --git a/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch b/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch new file mode 100644 index 000000000000..780970897f8e --- /dev/null +++ b/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch @@ -0,0 +1,415 @@ +diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py +index 435807a5..3999de1f 100644 +--- a/src/lxml/tests/test_elementtree.py ++++ b/src/lxml/tests/test_elementtree.py +@@ -27,7 +27,7 @@ if this_dir not in sys.path: + from common_imports import BytesIO, etree, HelperTestCase + from common_imports import ElementTree, cElementTree, ET_VERSION, CET_VERSION + from common_imports import filter_by_version, fileInTestDir, canonicalize, tmpfile +-from common_imports import _str, _bytes, unicode, next, IS_PYTHON2 ++from common_imports import _str, _bytes, unicode, next, IS_PYTHON2, IS_PYPY + + if cElementTree is not None and (CET_VERSION <= (1,0,7) or sys.version_info[0] >= 3): + cElementTree = None +@@ -2928,6 +2928,7 @@ class _ETreeTestCaseBase(HelperTestCase): + self.assertEqual('TEST', root2[0].get('{%s}a' % ns_href)) + + required_versions_ET['test_register_namespace'] = (1,3) ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_register_namespace(self): + # ET 1.3+ + Element = self.etree.Element +diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py +index 9dc648eb..1853e546 100644 +--- a/src/lxml/tests/test_errors.py ++++ b/src/lxml/tests/test_errors.py +@@ -13,7 +13,7 @@ this_dir = os.path.dirname(__file__) + if this_dir not in sys.path: + sys.path.insert(0, this_dir) # needed for Py3 + +-from common_imports import HelperTestCase ++from common_imports import HelperTestCase, IS_PYPY + + + class ErrorTestCase(HelperTestCase): +@@ -27,6 +27,7 @@ class ErrorTestCase(HelperTestCase): + def test_empty_parse(self): + self.assertRaises(etree.XMLSyntaxError, etree.fromstring, '') + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_element_cyclic_gc_none(self): + # test if cyclic reference can crash etree + Element = self.etree.Element +diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py +index d058fad2..b905fdfb 100644 +--- a/src/lxml/tests/test_http_io.py ++++ b/src/lxml/tests/test_http_io.py +@@ -17,10 +17,11 @@ if this_dir not in sys.path: + sys.path.insert(0, this_dir) # needed for Py3 + + from .common_imports import ( +- etree, HelperTestCase, BytesIO, _bytes) ++ etree, HelperTestCase, BytesIO, _bytes, IS_PYPY) + from .dummy_http_server import webserver, HTTPRequestCollector + + ++@unittest.skipIf(IS_PYPY, "broken on pypy") + class HttpIOTestCase(HelperTestCase): + etree = etree + +diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py +index b8b41063..e8d275b9 100644 +--- a/src/lxml/tests/test_nsclasses.py ++++ b/src/lxml/tests/test_nsclasses.py +@@ -12,7 +12,7 @@ if this_dir not in sys.path: + sys.path.insert(0, this_dir) # needed for Py3 + + from common_imports import etree, HelperTestCase, _bytes +-from common_imports import doctest, make_doctest ++from common_imports import doctest, make_doctest, IS_PYPY + + class ETreeNamespaceClassesTestCase(HelperTestCase): + +@@ -49,6 +49,7 @@ class ETreeNamespaceClassesTestCase(HelperTestCase): + self.Namespace('ns02').clear() + self.Namespace('ns03').clear() + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_ns_classes(self): + bluff_dict = {'bluff' : self.bluff_class} + maeh_dict = {'maeh' : self.maeh_class} +diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py +index 78035d04..45e73d97 100644 +--- a/src/lxml/tests/test_objectify.py ++++ b/src/lxml/tests/test_objectify.py +@@ -13,7 +13,7 @@ if this_dir not in sys.path: + + from common_imports import etree, HelperTestCase, fileInTestDir + from common_imports import SillyFileLike, canonicalize, doctest, make_doctest +-from common_imports import _bytes, _str, StringIO, BytesIO ++from common_imports import _bytes, _str, StringIO, BytesIO, IS_PYPY + + from lxml import objectify + +@@ -216,11 +216,13 @@ class ObjectifyTestCase(HelperTestCase): + expected.update(DEFAULT_NSMAP) + self.assertEqual(root.value.nsmap, expected) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_date_element_efactory_text(self): + # ObjectifiedDataElement can also be used as E-Factory + value = objectify.ObjectifiedDataElement('test', 'toast') + self.assertEqual(value.text, 'testtoast') + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_date_element_efactory_tail(self): + # ObjectifiedDataElement can also be used as E-Factory + value = objectify.ObjectifiedElement(objectify.ObjectifiedDataElement(), 'test', 'toast') +@@ -377,6 +379,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual("4", getattr(root.c1, "{}c2").text) + self.assertEqual("0", getattr(root.c1, "c2").text) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_setattr(self): + for val in [ + 2, 2**32, 1.2, "Won't get fooled again", +@@ -812,6 +815,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual(3, len(root.findall(".//b"))) + self.assertEqual(2, len(root.findall("b"))) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_build_tree(self): + root = self.Element('root') + root.a = 5 +@@ -841,6 +845,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual(value, None) + self.assertEqual(value.get(XML_SCHEMA_NIL_ATTR), "true") + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_bool(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -874,6 +879,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertTrue(isinstance(value, objectify.BoolElement)) + self.assertEqual(value, False) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -881,6 +887,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = "test" + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_intliteral(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -888,6 +895,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = "3" + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_floatliteral(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -895,6 +903,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = "3.72" + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_mul(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -907,6 +916,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertRaises(TypeError, operator.mul, root.s, "honk") + self.assertRaises(TypeError, operator.mul, "honk", root.s) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_add(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -917,6 +927,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual("test" + s, root.s + s) + self.assertEqual(s + "test", s + root.s) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_mod(self): + s = "%d %f %s %r" + el = objectify.DataElement(s) +@@ -982,6 +993,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertTrue(isinstance(value, objectify.StringElement)) + self.assertEqual(value, "3.20") + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -989,6 +1001,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = _str("test") + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_intliteral(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -996,6 +1009,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = _str("3") + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_floatliteral(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -1003,6 +1017,7 @@ class ObjectifyTestCase(HelperTestCase): + root.s = _str("3.72") + self.assertTrue(isinstance(root.s, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_mul(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -1015,6 +1030,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertRaises(TypeError, operator.mul, root.s, _str("honk")) + self.assertRaises(TypeError, operator.mul, _str("honk"), root.s) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_add(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -1040,6 +1056,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertTrue(isinstance(value, objectify.StringElement)) + self.assertEqual(value, _str("3.20")) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_int(self): + Element = self.Element + root = Element("{objectified}root") +@@ -1056,6 +1073,7 @@ class ObjectifyTestCase(HelperTestCase): + value = objectify.DataElement(123) + self.assertEqual(hash(value), hash(123)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -1072,6 +1090,7 @@ class ObjectifyTestCase(HelperTestCase): + value = objectify.DataElement(5.5) + self.assertEqual(hash(value), hash(5.5)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float_precision(self): + # test not losing precision by shortened float str() value + # repr(2.305064300557): '2.305064300557' +@@ -1091,6 +1110,7 @@ class ObjectifyTestCase(HelperTestCase): + s = "2.305064300557" + self.assertEqual(objectify.FloatElement(s), float(s)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float_precision_consistency(self): + # test consistent FloatElement values for the different instantiation + # possibilities +@@ -1172,6 +1192,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual(value.text, None) + self.assertEqual(value.pyval, None) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_unregistered(self): + Element = self.Element + SubElement = self.etree.SubElement +@@ -1334,6 +1355,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual(["why", "try"], + strs) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_cmp(self): + XML = self.XML + root = XML(_bytes('testtaste')) +@@ -1361,6 +1383,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertEqual(root.b, "") + self.assertEqual("", root.b) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_int_cmp(self): + XML = self.XML + root = XML(_bytes('56')) +@@ -1383,6 +1406,7 @@ class ObjectifyTestCase(HelperTestCase): + + # float + long share the NumberElement implementation with int + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_bool_cmp(self): + XML = self.XML + root = XML(_bytes('falsetrue')) +@@ -2052,6 +2076,7 @@ class ObjectifyTestCase(HelperTestCase): + before = [objectify.getRegisteredTypes()[0].name], + after = [objectify.getRegisteredTypes()[1].name]) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_registered_type_stringify(self): + from datetime import datetime + def parse_date(value): +@@ -2522,46 +2547,55 @@ class ObjectifyTestCase(HelperTestCase): + + # E-Factory tests, need to use sub-elements as root element is always + # type-looked-up as ObjectifiedElement (no annotations) ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_int(self): + E = objectify.E + root = E.root(E.val(23)) + self.assertTrue(isinstance(root.val, objectify.IntElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_float(self): + E = objectify.E + root = E.root(E.val(233.23)) + self.assertTrue(isinstance(root.val, objectify.FloatElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_str(self): + E = objectify.E + root = E.root(E.val("what?")) + self.assertTrue(isinstance(root.val, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_unicode(self): + E = objectify.E + root = E.root(E.val(_str("blöödy häll", encoding="ISO-8859-1"))) + self.assertTrue(isinstance(root.val, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_bool(self): + E = objectify.E + root = E.root(E.val(True)) + self.assertTrue(isinstance(root.val, objectify.BoolElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_none(self): + E = objectify.E + root = E.root(E.val(None)) + self.assertTrue(isinstance(root.val, objectify.NoneElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_value_concatenation(self): + E = objectify.E + root = E.root(E.val(1, "foo", 2.0, "bar ", True, None)) + self.assertTrue(isinstance(root.val, objectify.StringElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_attrib(self): + E = objectify.E + root = E.root(foo="bar") + self.assertEqual(root.get("foo"), "bar") + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_nested(self): + E = objectify.E + DataElement = objectify.DataElement +@@ -2576,6 +2610,7 @@ class ObjectifyTestCase(HelperTestCase): + self.assertTrue(isinstance(root.value[0], objectify.IntElement)) + self.assertTrue(isinstance(root.value[1], objectify.FloatElement)) + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_subtype(self): + class Attribute(objectify.ObjectifiedDataElement): + def __init__(self): +@@ -2677,7 +2712,8 @@ def test_suite(): + suite = unittest.TestSuite() + suite.addTests([unittest.makeSuite(ObjectifyTestCase)]) + 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 + + if __name__ == '__main__': +diff --git a/src/lxml/tests/test_xpathevaluator.py b/src/lxml/tests/test_xpathevaluator.py +index a2df6ddb..0951d5e1 100644 +--- a/src/lxml/tests/test_xpathevaluator.py ++++ b/src/lxml/tests/test_xpathevaluator.py +@@ -11,7 +11,7 @@ if this_dir not in sys.path: + sys.path.insert(0, this_dir) # needed for Py3 + + from common_imports import etree, HelperTestCase, _bytes, BytesIO +-from common_imports import doctest, make_doctest ++from common_imports import doctest, make_doctest, IS_PYPY + + class ETreeXPathTestCase(HelperTestCase): + """XPath tests etree""" +@@ -742,8 +742,9 @@ def test_suite(): + suite.addTests([unittest.makeSuite(ETreeXPathExsltTestCase)]) + suite.addTests([unittest.makeSuite(ETreeETXPathClassTestCase)]) + suite.addTests([doctest.DocTestSuite()]) +- suite.addTests( +- [make_doctest('../../../doc/xpathxslt.txt')]) ++ if not IS_PYPY: ++ suite.addTests( ++ [make_doctest('../../../doc/xpathxslt.txt')]) + return suite + + if __name__ == '__main__': +diff --git a/src/lxml/tests/test_xslt.py b/src/lxml/tests/test_xslt.py +index 08d03514..b81716c5 100644 +--- a/src/lxml/tests/test_xslt.py ++++ b/src/lxml/tests/test_xslt.py +@@ -19,6 +19,8 @@ if this_dir not in sys.path: + sys.path.insert(0, this_dir) # needed for Py3 + + is_python3 = sys.version_info[0] >= 3 ++is_pypy = (getattr(sys, 'implementation', None) == 'pypy' or ++ getattr(sys, 'pypy_version_info', None) is not None) + + try: + unicode +@@ -2085,8 +2087,9 @@ def test_suite(): + suite.addTests([unittest.makeSuite(Py3XSLTTestCase)]) + suite.addTests( + [make_doctest('../../../doc/extensions.txt')]) +- suite.addTests( +- [make_doctest('../../../doc/xpathxslt.txt')]) ++ if not is_pypy: ++ suite.addTests( ++ [make_doctest('../../../doc/xpathxslt.txt')]) + return suite + + if __name__ == '__main__': diff --git a/dev-python/lxml/lxml-4.2.5.ebuild b/dev-python/lxml/lxml-4.2.5.ebuild index e2e1341ce7a4..adc8e649fc0c 100644 --- a/dev-python/lxml/lxml-4.2.5.ebuild +++ b/dev-python/lxml/lxml-4.2.5.ebuild @@ -15,6 +15,7 @@ LICENSE="BSD ElementTree GPL-2 PSF-2" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" # Note: lib{xml2,xslt} are used as C libraries, not Python modules. RDEPEND=" diff --git a/dev-python/lxml/lxml-4.3.3.ebuild b/dev-python/lxml/lxml-4.3.3.ebuild index 55906ef92c56..ff99e731288e 100644 --- a/dev-python/lxml/lxml-4.3.3.ebuild +++ b/dev-python/lxml/lxml-4.3.3.ebuild @@ -15,6 +15,7 @@ LICENSE="BSD ElementTree GPL-2 PSF-2" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" # Note: lib{xml2,xslt} are used as C libraries, not Python modules. RDEPEND=" diff --git a/dev-python/lxml/lxml-4.3.4.ebuild b/dev-python/lxml/lxml-4.3.4.ebuild index 09e2ae46af6b..b415e336a4f2 100644 --- a/dev-python/lxml/lxml-4.3.4.ebuild +++ b/dev-python/lxml/lxml-4.3.4.ebuild @@ -15,6 +15,7 @@ LICENSE="BSD ElementTree GPL-2 PSF-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" # Note: lib{xml2,xslt} are used as C libraries, not Python modules. RDEPEND=" diff --git a/dev-python/lxml/lxml-4.4.0.ebuild b/dev-python/lxml/lxml-4.4.0.ebuild index 566ef037bba5..712977728290 100644 --- a/dev-python/lxml/lxml-4.4.0.ebuild +++ b/dev-python/lxml/lxml-4.4.0.ebuild @@ -15,6 +15,7 @@ LICENSE="BSD ElementTree GPL-2 PSF-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" # Note: lib{xml2,xslt} are used as C libraries, not Python modules. RDEPEND=" diff --git a/dev-python/lxml/lxml-4.4.1.ebuild b/dev-python/lxml/lxml-4.4.1.ebuild index 566ef037bba5..2d1ba408e65b 100644 --- a/dev-python/lxml/lxml-4.4.1.ebuild +++ b/dev-python/lxml/lxml-4.4.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy ) inherit distutils-r1 eutils toolchain-funcs @@ -15,6 +15,7 @@ LICENSE="BSD ElementTree GPL-2 PSF-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" # Note: lib{xml2,xslt} are used as C libraries, not Python modules. RDEPEND=" diff --git a/dev-python/lxml/lxml-4.4.2.ebuild b/dev-python/lxml/lxml-4.4.2.ebuild new file mode 100644 index 000000000000..03335ffe1d8f --- /dev/null +++ b/dev-python/lxml/lxml-4.4.2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) + +inherit distutils-r1 eutils 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" + +LICENSE="BSD ElementTree GPL-2 PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" + +# Note: lib{xml2,xslt} are used as C libraries, not Python modules. +RDEPEND=" + >=dev-libs/libxml2-2.9.5 + >=dev-libs/libxslt-1.1.28" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/cssselect[${PYTHON_USEDEP}] ) + " + +DISTUTILS_IN_SOURCE_BUILD=1 +S=${WORKDIR}/lxml-${P} + +PATCHES=( + "${FILESDIR}"/${PN}-3.5.0-cross-compile.patch + "${FILESDIR}"/${PN}-4.4.2-tests-pypy.patch +) + +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() { + if ! python_is_python3; then + local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + fi + tc-export PKG_CONFIG + distutils-r1_python_compile +} + +python_test() { + cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die + cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die + ln -s "${S}"/doc "${BUILD_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/beautifulsoup + optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect +} -- cgit v1.2.3