mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
python3-lxml: patch and rebuild for Cython 3
This commit is contained in:
parent
fa63032fd2
commit
2db11f2b81
5 changed files with 55 additions and 6 deletions
32
srcpkgs/python3-lxml/patches/cython3-fix-test.patch
Normal file
32
srcpkgs/python3-lxml/patches/cython3-fix-test.patch
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py
|
||||||
|
index c0aee744..4875f298 100644
|
||||||
|
--- a/src/lxml/tests/test_errors.py
|
||||||
|
+++ b/src/lxml/tests/test_errors.py
|
||||||
|
@@ -28,7 +28,6 @@ class ErrorTestCase(HelperTestCase):
|
||||||
|
def test_element_cyclic_gc_none(self):
|
||||||
|
# test if cyclic reference can crash etree
|
||||||
|
Element = self.etree.Element
|
||||||
|
- getrefcount = sys.getrefcount
|
||||||
|
|
||||||
|
# must disable tracing as it could change the refcounts
|
||||||
|
trace_func = sys.gettrace()
|
||||||
|
@@ -36,16 +35,16 @@ class ErrorTestCase(HelperTestCase):
|
||||||
|
sys.settrace(None)
|
||||||
|
gc.collect()
|
||||||
|
|
||||||
|
- count = getrefcount(None)
|
||||||
|
+ count1 = gc.get_count()
|
||||||
|
|
||||||
|
l = [Element('name'), Element('name')]
|
||||||
|
l.append(l)
|
||||||
|
|
||||||
|
del l
|
||||||
|
gc.collect()
|
||||||
|
- count = getrefcount(None) - count
|
||||||
|
+ count2 = gc.get_count()
|
||||||
|
|
||||||
|
- self.assertEqual(count, 0)
|
||||||
|
+ self.assertEqual(count1, count2)
|
||||||
|
finally:
|
||||||
|
sys.settrace(trace_func)
|
||||||
|
|
12
srcpkgs/python3-lxml/patches/cython3-legacy.patch
Normal file
12
srcpkgs/python3-lxml/patches/cython3-legacy.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/setupinfo.py b/setupinfo.py
|
||||||
|
index 5feb13bf..ea1b391c 100644
|
||||||
|
--- a/setupinfo.py
|
||||||
|
+++ b/setupinfo.py
|
||||||
|
@@ -148,6 +148,7 @@ def ext_modules(static_include_dirs, static_library_dirs,
|
||||||
|
|
||||||
|
cythonize_directives = {
|
||||||
|
'binding': True,
|
||||||
|
+ 'legacy_implicit_noexcept': True,
|
||||||
|
}
|
||||||
|
if OPTION_WITH_COVERAGE:
|
||||||
|
cythonize_directives['linetrace'] = True
|
|
@ -1,13 +1,17 @@
|
||||||
|
From alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/py3-lxml
|
||||||
|
|
||||||
|
the find above returns None with this version
|
||||||
|
--
|
||||||
diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
|
diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
|
||||||
index 0339796d..de584c56 100644
|
index 0339796..790c57a 100644
|
||||||
--- a/src/lxml/tests/test_etree.py
|
--- a/src/lxml/tests/test_etree.py
|
||||||
+++ b/src/lxml/tests/test_etree.py
|
+++ b/src/lxml/tests/test_etree.py
|
||||||
@@ -3072,8 +3072,6 @@ class ETreeOnlyTestCase(HelperTestCase):
|
@@ -3073,7 +3073,7 @@ class ETreeOnlyTestCase(HelperTestCase):
|
||||||
el = etree.HTML('<hha:page-description>aa</hha:page-description>').find('.//page-description')
|
|
||||||
if etree.LIBXML_VERSION < (2, 9, 11):
|
if etree.LIBXML_VERSION < (2, 9, 11):
|
||||||
self.assertEqual({'hha': None}, el.nsmap)
|
self.assertEqual({'hha': None}, el.nsmap)
|
||||||
- else:
|
else:
|
||||||
- self.assertEqual({}, el.nsmap)
|
- self.assertEqual({}, el.nsmap)
|
||||||
|
+ self.assertEqual(None, el)
|
||||||
|
|
||||||
def test_getchildren(self):
|
def test_getchildren(self):
|
||||||
Element = self.etree.Element
|
Element = self.etree.Element
|
|
@ -1,3 +1,5 @@
|
||||||
|
From alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/py3-lxml
|
||||||
|
|
||||||
diff --git a/src/lxml/tests/test_io.py b/src/lxml/tests/test_io.py
|
diff --git a/src/lxml/tests/test_io.py b/src/lxml/tests/test_io.py
|
||||||
index cbdbcef..efbd3fd 100644
|
index cbdbcef..efbd3fd 100644
|
||||||
--- a/src/lxml/tests/test_io.py
|
--- a/src/lxml/tests/test_io.py
|
||||||
|
@ -10,4 +12,3 @@ index cbdbcef..efbd3fd 100644
|
||||||
|
|
||||||
f = tempfile.NamedTemporaryFile(delete=False)
|
f = tempfile.NamedTemporaryFile(delete=False)
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'python3-lxml'
|
# Template file for 'python3-lxml'
|
||||||
pkgname=python3-lxml
|
pkgname=python3-lxml
|
||||||
version=4.9.3
|
version=4.9.3
|
||||||
revision=1
|
revision=2
|
||||||
build_style=python3-module
|
build_style=python3-module
|
||||||
make_build_args="--with-cython"
|
make_build_args="--with-cython"
|
||||||
hostmakedepends="python3-Cython python3-setuptools"
|
hostmakedepends="python3-Cython python3-setuptools"
|
||||||
|
|
Loading…
Add table
Reference in a new issue