public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/files/
@ 2016-03-17 20:50 Dirkjan Ochtman
  0 siblings, 0 replies; 5+ messages in thread
From: Dirkjan Ochtman @ 2016-03-17 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     7d94eb446eb6f800c4a3e3c3c6969a58fe291b53
Author:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 20:49:15 2016 +0000
Commit:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 20:49:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d94eb44

dev-python/lxml: fix bug in cross-compilation patch(es)

 dev-python/lxml/files/lxml-3.4.4-cross-compile.patch | 2 +-
 dev-python/lxml/files/lxml-3.5.0-cross-compile.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch b/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch
index 7d1ed17..049b884 100644
--- a/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch
+++ b/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch
@@ -30,7 +30,7 @@ use pkg-config to find libxml2/libxslt details rather than xxx-config scripts
 -    xslt_flags = run_command(find_xslt_config(), "--%s" % option)
 +    pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
 +    xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option)
-+    xslt_flags = run_command(pkg_config, 'libxxlt', '--%s' % option)
++    xslt_flags = run_command(pkg_config, 'libxslt', '--%s' % option)
  
      flag_list = xml2_flags.split()
      for flag in xslt_flags.split():

diff --git a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
index 54e4087..82a371c 100644
--- a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
+++ b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
@@ -33,7 +33,7 @@ index e04c38f..0549eaa 100644
 -    xslt_flags = run_command(find_xslt_config(), "--%s" % option)
 +    pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
 +    xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option)
-+    xslt_flags = run_command(pkg_config, 'libxxlt', '--%s' % option)
++    xslt_flags = run_command(pkg_config, 'libxslt', '--%s' % option)
  
      flag_list = xml2_flags.split()
      for flag in xslt_flags.split():


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/files/
@ 2020-06-02  4:28 Aaron Bauman
  0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2020-06-02  4:28 UTC (permalink / raw
  To: gentoo-commits

commit:     33dcd1e862f8c08509ac7d63cd90411159448053
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue May 19 19:21:40 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 04:28:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33dcd1e8

dev-python/lxml: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch | 415 ----------------------
 1 file changed, 415 deletions(-)

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
deleted file mode 100644
index 780970897f8..00000000000
--- a/dev-python/lxml/files/lxml-4.4.2-tests-pypy.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-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('<root><b>test</b><b>taste</b><b></b><b/></root>'))
-@@ -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('<root><b>5</b><b>6</b></root>'))
-@@ -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('<root><b>false</b><b>true</b></root>'))
-@@ -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__':


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/files/
@ 2020-09-12  9:55 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-09-12  9:55 UTC (permalink / raw
  To: gentoo-commits

commit:     af1255b1ed649d70b728cc829b5a7df96550fce5
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 28 16:53:49 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 09:54:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1255b1

dev-python/lxml: remove unused patch

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../lxml/files/lxml-3.5.0-cross-compile.patch      | 39 ----------------------
 1 file changed, 39 deletions(-)

diff --git a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
deleted file mode 100644
index 82a371c7297..00000000000
--- a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
- setupinfo.py | 18 +++---------------
- 1 file changed, 3 insertions(+), 15 deletions(-)
-
-diff --git a/setupinfo.py b/setupinfo.py
-index e04c38f..0549eaa 100644
---- a/setupinfo.py
-+++ b/setupinfo.py
-@@ -93,19 +93,6 @@ def ext_modules(static_include_dirs, static_library_dirs,
-         source_extension = ".c"
-         print("Building without Cython.")
- 
--    lib_versions = get_library_versions()
--    versions_ok = True
--    if lib_versions[0]:
--        print("Using build configuration of libxml2 %s and libxslt %s" %
--              lib_versions)
--        versions_ok = check_min_version(lib_versions[0], (2, 7, 0), 'libxml2')
--    else:
--        print("Using build configuration of libxslt %s" %
--              lib_versions[1])
--    versions_ok |= check_min_version(lib_versions[1], (1, 1, 23), 'libxslt')
--    if not versions_ok:
--        raise RuntimeError("Dependency missing")
--
-     base_dir = get_base_dir()
-     _include_dirs = _prefer_reldirs(
-         base_dir, include_dirs(static_include_dirs) + [INCLUDE_PACKAGE_PATH])
-@@ -358,8 +345,9 @@ def get_library_versions():
- 
- 
- def flags(option):
--    xml2_flags = run_command(find_xml2_config(), "--%s" % option)
--    xslt_flags = run_command(find_xslt_config(), "--%s" % option)
-+    pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
-+    xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option)
-+    xslt_flags = run_command(pkg_config, 'libxslt', '--%s' % option)
- 
-     flag_list = xml2_flags.split()
-     for flag in xslt_flags.split():


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/files/
@ 2020-09-20 14:41 Conrad Kostecki
  0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2020-09-20 14:41 UTC (permalink / raw
  To: gentoo-commits

commit:     8ad8dcb47d7d84eca8b96533b8a6e21e81278580
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Sep 19 16:16:06 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 14:38:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad8dcb4

dev-python/lxml: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/17602
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-python/lxml/files/lxml-4.5.1-py39.patch | 620 ----------------------------
 1 file changed, 620 deletions(-)

diff --git a/dev-python/lxml/files/lxml-4.5.1-py39.patch b/dev-python/lxml/files/lxml-4.5.1-py39.patch
deleted file mode 100644
index 3032e537927..00000000000
--- a/dev-python/lxml/files/lxml-4.5.1-py39.patch
+++ /dev/null
@@ -1,620 +0,0 @@
-From e5c5cd22d918cd3b196e109a7829dad02d9ef42e Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Tue, 26 May 2020 11:20:18 +0200
-Subject: [PATCH 1/2] Move some ElementTree compatibility tests over to the
- etree-only tests since the features were removed in Py3.9.
-
----
- src/lxml/tests/test_elementtree.py | 254 +----------------------------
- src/lxml/tests/test_etree.py       | 246 ++++++++++++++++++++++++++++
- 2 files changed, 252 insertions(+), 248 deletions(-)
-
-diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
-index 78d8964d..ec765ee0 100644
---- a/src/lxml/tests/test_elementtree.py
-+++ b/src/lxml/tests/test_elementtree.py
-@@ -130,7 +130,8 @@ class _ETreeTestCaseBase(HelperTestCase):
-         check_method(element.extend)
-         check_method(element.insert)
-         check_method(element.remove)
--        check_method(element.getchildren)
-+        # Removed in Py3.9
-+        #check_method(element.getchildren)
-         check_method(element.find)
-         check_method(element.iterfind)
-         check_method(element.findall)
-@@ -142,7 +143,8 @@ class _ETreeTestCaseBase(HelperTestCase):
-         check_method(element.items)
-         check_method(element.iter)
-         check_method(element.itertext)
--        check_method(element.getiterator)
-+        # Removed in Py3.9
-+        #check_method(element.getiterator)
- 
-         # These methods return an iterable. See bug 6472.
- 
-@@ -1933,28 +1935,6 @@ class _ETreeTestCaseBase(HelperTestCase):
-             a.remove(el)
-         self.assertLess(len(a), 3)
- 
--    def test_getchildren(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--        self.assertXML(
--            _bytes('<a><b><d></d></b><c><e></e></c></a>'),
--            a)
--        self.assertEqual(
--            [b, c],
--            a.getchildren())
--        self.assertEqual(
--            [d],
--            b.getchildren())
--        self.assertEqual(
--            [],
--            d.getchildren())
--
-     def test_makeelement(self):
-         Element = self.etree.Element
- 
-@@ -2010,184 +1990,6 @@ class _ETreeTestCaseBase(HelperTestCase):
-             [None] * 5,
-             [el.tail for el in a.iter()])
- 
--    def test_getiterator(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--
--        self.assertEqual(
--            [a, b, d, c, e],
--            list(a.getiterator()))
--        self.assertEqual(
--            [d],
--            list(d.getiterator()))
--
--    def test_getiterator_empty(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--
--        self.assertEqual(
--            [],
--            list(a.getiterator('none')))
--        self.assertEqual(
--            [],
--            list(e.getiterator('none')))
--        self.assertEqual(
--            [e],
--            list(e.getiterator()))
--
--    def test_getiterator_filter(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--
--        self.assertEqual(
--            [a],
--            list(a.getiterator('a')))
--        a2 = SubElement(e, 'a')
--        self.assertEqual(
--            [a, a2],
--            list(a.getiterator('a')))
--        self.assertEqual(
--            [a2],
--            list(c.getiterator('a')))
--
--    def test_getiterator_filter_all(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--
--        self.assertEqual(
--            [a, b, d, c, e],
--            list(a.getiterator('*')))
--
--    def test_getiterator_filter_comment(self):
--        Element = self.etree.Element
--        Comment = self.etree.Comment
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        comment_b = Comment("TEST-b")
--        b.append(comment_b)
--
--        self.assertEqual(
--            [comment_b],
--            list(a.getiterator(Comment)))
--
--        comment_a = Comment("TEST-a")
--        a.append(comment_a)
--
--        self.assertEqual(
--            [comment_b, comment_a],
--            list(a.getiterator(Comment)))
--
--        self.assertEqual(
--            [comment_b],
--            list(b.getiterator(Comment)))
--
--    def test_getiterator_filter_pi(self):
--        Element = self.etree.Element
--        PI = self.etree.ProcessingInstruction
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        pi_b = PI("TEST-b")
--        b.append(pi_b)
--
--        self.assertEqual(
--            [pi_b],
--            list(a.getiterator(PI)))
--
--        pi_a = PI("TEST-a")
--        a.append(pi_a)
--
--        self.assertEqual(
--            [pi_b, pi_a],
--            list(a.getiterator(PI)))
--
--        self.assertEqual(
--            [pi_b],
--            list(b.getiterator(PI)))
--
--    def test_getiterator_with_text(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        a.text = 'a'
--        b = SubElement(a, 'b')
--        b.text = 'b'
--        b.tail = 'b1'
--        c = SubElement(a, 'c')
--        c.text = 'c'
--        c.tail = 'c1'
--        d = SubElement(b, 'd')
--        d.text = 'd'
--        d.tail = 'd1'
--        e = SubElement(c, 'e')
--        e.text = 'e'
--        e.tail = 'e1'
--
--        self.assertEqual(
--            [a, b, d, c, e],
--            list(a.getiterator()))
--        #self.assertEqual(
--        #    [d],
--        #    list(d.getiterator()))
--
--    def test_getiterator_filter_with_text(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--
--        a = Element('a')
--        a.text = 'a'
--        b = SubElement(a, 'b')
--        b.text = 'b'
--        b.tail = 'b1'
--        c = SubElement(a, 'c')
--        c.text = 'c'
--        c.tail = 'c1'
--        d = SubElement(b, 'd')
--        d.text = 'd'
--        d.tail = 'd1'
--        e = SubElement(c, 'e')
--        e.text = 'e'
--        e.tail = 'e1'
--
--        self.assertEqual(
--            [a],
--            list(a.getiterator('a')))
--        a2 = SubElement(e, 'a')
--        self.assertEqual(
--            [a, a2],
--            list(a.getiterator('a')))   
--        self.assertEqual(
--            [a2],
--            list(e.getiterator('a')))
--
-     def test_getslice(self):
-         Element = self.etree.Element
-         SubElement = self.etree.SubElement
-@@ -2710,41 +2512,6 @@ class _ETreeTestCaseBase(HelperTestCase):
-         self.assertEqual('A2',
-                           a.tail)
- 
--    def test_elementtree_getiterator(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--        ElementTree = self.etree.ElementTree
--
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--        t = ElementTree(element=a)
--
--        self.assertEqual(
--            [a, b, d, c, e],
--            list(t.getiterator()))
--
--    def test_elementtree_getiterator_filter(self):
--        Element = self.etree.Element
--        SubElement = self.etree.SubElement
--        ElementTree = self.etree.ElementTree
--        a = Element('a')
--        b = SubElement(a, 'b')
--        c = SubElement(a, 'c')
--        d = SubElement(b, 'd')
--        e = SubElement(c, 'e')
--        t = ElementTree(element=a)
--
--        self.assertEqual(
--            [a],
--            list(t.getiterator('a')))
--        a2 = SubElement(e, 'a')
--        self.assertEqual(
--            [a, a2],
--            list(t.getiterator('a')))
--
-     def test_ns_access(self):
-         ElementTree = self.etree.ElementTree
-         ns = 'http://xml.infrae.com/1'
-@@ -3180,17 +2947,6 @@ class _ETreeTestCaseBase(HelperTestCase):
-             'value',
-             root[0].get(attr_name))
- 
--    def test_iterparse_getiterator(self):
--        iterparse = self.etree.iterparse
--        f = BytesIO('<a><b><d/></b><c/></a>')
--
--        counts = []
--        for event, elem in iterparse(f):
--            counts.append(len(list(elem.getiterator())))
--        self.assertEqual(
--            [1,2,1,4],
--            counts)
--
-     def test_iterparse_move_elements(self):
-         iterparse = self.etree.iterparse
-         f = BytesIO('<a><b><d/></b><c/></a>')
-@@ -5119,6 +4875,8 @@ if ElementTree:
- 
-         @classmethod
-         def setUpClass(cls):
-+            if sys.version_info >= (3, 9):
-+                return
-             import warnings
-             # ElementTree warns about getiterator() in recent Pythons
-             warnings.filterwarnings(
-diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
-index 3d8dee1c..56d38e75 100644
---- a/src/lxml/tests/test_etree.py
-+++ b/src/lxml/tests/test_etree.py
-@@ -674,6 +674,17 @@ class ETreeOnlyTestCase(HelperTestCase):
-         parse = self.etree.parse
-         self.assertRaises(TypeError, parse, 'notthere.xml', object())
- 
-+    def test_iterparse_getiterator(self):
-+        iterparse = self.etree.iterparse
-+        f = BytesIO('<a><b><d/></b><c/></a>')
-+
-+        counts = []
-+        for event, elem in iterparse(f):
-+            counts.append(len(list(elem.getiterator())))
-+        self.assertEqual(
-+            [1,2,1,4],
-+            counts)
-+
-     def test_iterparse_tree_comments(self):
-         # ET removes comments
-         iterparse = self.etree.iterparse
-@@ -3027,6 +3038,206 @@ class ETreeOnlyTestCase(HelperTestCase):
-         el = etree.HTML('<hha:page-description>aa</hha:page-description>').find('.//page-description')
-         self.assertEqual({'hha': None}, el.nsmap)
- 
-+    def test_getchildren(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+        self.assertXML(
-+            _bytes('<a><b><d></d></b><c><e></e></c></a>'),
-+            a)
-+        self.assertEqual(
-+            [b, c],
-+            a.getchildren())
-+        self.assertEqual(
-+            [d],
-+            b.getchildren())
-+        self.assertEqual(
-+            [],
-+            d.getchildren())
-+
-+    def test_getiterator(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+
-+        self.assertEqual(
-+            [a, b, d, c, e],
-+            list(a.getiterator()))
-+        self.assertEqual(
-+            [d],
-+            list(d.getiterator()))
-+
-+    def test_getiterator_empty(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+
-+        self.assertEqual(
-+            [],
-+            list(a.getiterator('none')))
-+        self.assertEqual(
-+            [],
-+            list(e.getiterator('none')))
-+        self.assertEqual(
-+            [e],
-+            list(e.getiterator()))
-+
-+    def test_getiterator_filter(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+
-+        self.assertEqual(
-+            [a],
-+            list(a.getiterator('a')))
-+        a2 = SubElement(e, 'a')
-+        self.assertEqual(
-+            [a, a2],
-+            list(a.getiterator('a')))
-+        self.assertEqual(
-+            [a2],
-+            list(c.getiterator('a')))
-+
-+    def test_getiterator_filter_all(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+
-+        self.assertEqual(
-+            [a, b, d, c, e],
-+            list(a.getiterator('*')))
-+
-+    def test_getiterator_filter_comment(self):
-+        Element = self.etree.Element
-+        Comment = self.etree.Comment
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        comment_b = Comment("TEST-b")
-+        b.append(comment_b)
-+
-+        self.assertEqual(
-+            [comment_b],
-+            list(a.getiterator(Comment)))
-+
-+        comment_a = Comment("TEST-a")
-+        a.append(comment_a)
-+
-+        self.assertEqual(
-+            [comment_b, comment_a],
-+            list(a.getiterator(Comment)))
-+
-+        self.assertEqual(
-+            [comment_b],
-+            list(b.getiterator(Comment)))
-+
-+    def test_getiterator_filter_pi(self):
-+        Element = self.etree.Element
-+        PI = self.etree.ProcessingInstruction
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        pi_b = PI("TEST-b")
-+        b.append(pi_b)
-+
-+        self.assertEqual(
-+            [pi_b],
-+            list(a.getiterator(PI)))
-+
-+        pi_a = PI("TEST-a")
-+        a.append(pi_a)
-+
-+        self.assertEqual(
-+            [pi_b, pi_a],
-+            list(a.getiterator(PI)))
-+
-+        self.assertEqual(
-+            [pi_b],
-+            list(b.getiterator(PI)))
-+
-+    def test_getiterator_with_text(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        a.text = 'a'
-+        b = SubElement(a, 'b')
-+        b.text = 'b'
-+        b.tail = 'b1'
-+        c = SubElement(a, 'c')
-+        c.text = 'c'
-+        c.tail = 'c1'
-+        d = SubElement(b, 'd')
-+        d.text = 'd'
-+        d.tail = 'd1'
-+        e = SubElement(c, 'e')
-+        e.text = 'e'
-+        e.tail = 'e1'
-+
-+        self.assertEqual(
-+            [a, b, d, c, e],
-+            list(a.getiterator()))
-+        #self.assertEqual(
-+        #    [d],
-+        #    list(d.getiterator()))
-+
-+    def test_getiterator_filter_with_text(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+
-+        a = Element('a')
-+        a.text = 'a'
-+        b = SubElement(a, 'b')
-+        b.text = 'b'
-+        b.tail = 'b1'
-+        c = SubElement(a, 'c')
-+        c.text = 'c'
-+        c.tail = 'c1'
-+        d = SubElement(b, 'd')
-+        d.text = 'd'
-+        d.tail = 'd1'
-+        e = SubElement(c, 'e')
-+        e.text = 'e'
-+        e.tail = 'e1'
-+
-+        self.assertEqual(
-+            [a],
-+            list(a.getiterator('a')))
-+        a2 = SubElement(e, 'a')
-+        self.assertEqual(
-+            [a, a2],
-+            list(a.getiterator('a')))
-+        self.assertEqual(
-+            [a2],
-+            list(e.getiterator('a')))
-+
-     def test_getiterator_filter_multiple(self):
-         Element = self.etree.Element
-         SubElement = self.etree.SubElement
-@@ -3203,6 +3414,41 @@ class ETreeOnlyTestCase(HelperTestCase):
-             [a, b, c],
-             list(a.getiterator('*')))
- 
-+    def test_elementtree_getiterator(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+        ElementTree = self.etree.ElementTree
-+
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+        t = ElementTree(element=a)
-+
-+        self.assertEqual(
-+            [a, b, d, c, e],
-+            list(t.getiterator()))
-+
-+    def test_elementtree_getiterator_filter(self):
-+        Element = self.etree.Element
-+        SubElement = self.etree.SubElement
-+        ElementTree = self.etree.ElementTree
-+        a = Element('a')
-+        b = SubElement(a, 'b')
-+        c = SubElement(a, 'c')
-+        d = SubElement(b, 'd')
-+        e = SubElement(c, 'e')
-+        t = ElementTree(element=a)
-+
-+        self.assertEqual(
-+            [a],
-+            list(t.getiterator('a')))
-+        a2 = SubElement(e, 'a')
-+        self.assertEqual(
-+            [a, a2],
-+            list(t.getiterator('a')))
-+
-     def test_elementtree_getelementpath(self):
-         a  = etree.Element("a")
-         b  = etree.SubElement(a, "b")
--- 
-2.26.2
-
-From 56ddb10e50eba7a6352e397f259d9497b44f658d Mon Sep 17 00:00:00 2001
-From: Stefan Behnel <stefan_ml@behnel.de>
-Date: Tue, 26 May 2020 11:30:45 +0200
-Subject: [PATCH 2/2] Fix a test after moving it to a different test module.
-
----
- src/lxml/tests/test_etree.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
-index 56d38e75..105c59b8 100644
---- a/src/lxml/tests/test_etree.py
-+++ b/src/lxml/tests/test_etree.py
-@@ -3047,9 +3047,9 @@ class ETreeOnlyTestCase(HelperTestCase):
-         c = SubElement(a, 'c')
-         d = SubElement(b, 'd')
-         e = SubElement(c, 'e')
--        self.assertXML(
-+        self.assertEqual(
-             _bytes('<a><b><d></d></b><c><e></e></c></a>'),
--            a)
-+            self.etree.tostring(a, method="c14n"))
-         self.assertEqual(
-             [b, c],
-             a.getchildren())
--- 
-2.26.2
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/files/
@ 2024-03-29 16:15 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2024-03-29 16:15 UTC (permalink / raw
  To: gentoo-commits

commit:     5467590ae1b78e90fcea7a2c58b70d0bbff4019f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 16:15:27 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 16:15:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5467590a

dev-python/lxml: Add missing patch file

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/lxml/files/lxml-5.1.1-pypy.patch | 162 ++++++++++++++++++++++++++++
 1 file changed, 162 insertions(+)

diff --git a/dev-python/lxml/files/lxml-5.1.1-pypy.patch b/dev-python/lxml/files/lxml-5.1.1-pypy.patch
new file mode 100644
index 000000000000..2f6a75781fb8
--- /dev/null
+++ b/dev-python/lxml/files/lxml-5.1.1-pypy.patch
@@ -0,0 +1,162 @@
+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


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-03-29 16:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-20 14:41 [gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2024-03-29 16:15 Michał Górny
2020-09-12  9:55 David Seifert
2020-06-02  4:28 Aaron Bauman
2016-03-17 20:50 Dirkjan Ochtman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox