public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/, dev-python/lxml/files/
Date: Fri, 29 Oct 2021 15:12:31 +0000 (UTC)	[thread overview]
Message-ID: <1635519991.d13eae5e5e10ef534833303d8a84cda4b2d81340.sam@gentoo> (raw)

commit:     d13eae5e5e10ef534833303d8a84cda4b2d81340
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 15:06:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 15:06:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d13eae5e

dev-python/lxml: fix tests with newer libxml2

Backport of upstream commit.

Closes: https://bugs.gentoo.org/791190
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../lxml/files/lxml-4.6.3-tests-libxml2.patch      | 22 ++++++++++++++++++++++
 dev-python/lxml/lxml-4.6.3-r1.ebuild               |  1 +
 2 files changed, 23 insertions(+)

diff --git a/dev-python/lxml/files/lxml-4.6.3-tests-libxml2.patch b/dev-python/lxml/files/lxml-4.6.3-tests-libxml2.patch
new file mode 100644
index 00000000000..4c682add3a2
--- /dev/null
+++ b/dev-python/lxml/files/lxml-4.6.3-tests-libxml2.patch
@@ -0,0 +1,22 @@
+https://github.com/lxml/lxml/commit/852ed1092bd80b6b9a51db24371047ec88843031
+https://bugs.gentoo.org/791190
+
+From: Stefan Behnel <stefan_ml@behnel.de>
+Date: Tue, 18 May 2021 22:02:02 +0200
+Subject: [PATCH] Adapt a test to a behavioural change in libxml2 2.9.11+.
+
+--- a/src/lxml/tests/test_etree.py
++++ b/src/lxml/tests/test_etree.py
+@@ -3036,7 +3036,10 @@ def test_subelement_nsmap(self):
+     def test_html_prefix_nsmap(self):
+         etree = self.etree
+         el = etree.HTML('<hha:page-description>aa</hha:page-description>').find('.//page-description')
+-        self.assertEqual({'hha': None}, el.nsmap)
++        if etree.LIBXML_VERSION < (2, 9, 11):
++            self.assertEqual({'hha': None}, el.nsmap)
++        else:
++            self.assertEqual({}, el.nsmap)
+ 
+     def test_getchildren(self):
+         Element = self.etree.Element
+

diff --git a/dev-python/lxml/lxml-4.6.3-r1.ebuild b/dev-python/lxml/lxml-4.6.3-r1.ebuild
index e0ce5bad3a3..cf132e42747 100644
--- a/dev-python/lxml/lxml-4.6.3-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.3-r1.ebuild
@@ -41,6 +41,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
+	"${FILESDIR}"/${P}-tests-libxml2.patch
 )
 
 python_check_deps() {


             reply	other threads:[~2021-10-29 15:12 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-29 15:12 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-27 16:13 [gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/, dev-python/lxml/files/ Michał Górny
2023-07-27  4:24 Sam James
2021-12-13  8:35 Michał Górny
2020-05-26 10:35 Michał Górny
2020-01-30  5:54 Michał Górny
2019-01-07 20:44 Virgil Dupras
2016-10-14 21:30 David Seifert
2015-11-13 13:20 Justin Lecher
2015-09-25  7:11 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1635519991.d13eae5e5e10ef534833303d8a84cda4b2d81340.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox