Skip to content

Commit 9395b1e

Browse files
committed
Add patch for lxml 5.4.0 and older
1 parent e8ec367 commit 9395b1e

File tree

7 files changed

+146
-3
lines changed

7 files changed

+146
-3
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/pyproject.toml b/pyproject.toml
2+
new file mode 100644
3+
index 0000000..2a76435
4+
--- /dev/null
5+
+++ b/pyproject.toml
6+
@@ -0,0 +1,3 @@
7+
+[build-system]
8+
+requires = ["setuptools >= 40.6.0", "wheel", "Cython==3.0.11"]
9+
+build-backend = "setuptools.build_meta:__legacy__"
10+
diff --git a/setupinfo.py b/setupinfo.py
11+
index 5feb13b..6ea719a 100644
12+
--- a/setupinfo.py
13+
+++ b/setupinfo.py
14+
@@ -539,7 +539,7 @@ OPTION_WITH_UNICODE_STRINGS = has_option('with-unicode-strings')
15+
OPTION_WITHOUT_ASSERT = has_option('without-assert')
16+
OPTION_WITHOUT_THREADING = has_option('without-threading')
17+
OPTION_WITHOUT_CYTHON = has_option('without-cython')
18+
-OPTION_WITH_CYTHON = has_option('with-cython')
19+
+OPTION_WITH_CYTHON = True # GraalVM change
20+
OPTION_WITH_CYTHON_GDB = has_option('cython-gdb')
21+
OPTION_WITH_REFNANNY = has_option('with-refnanny')
22+
OPTION_WITH_COVERAGE = has_option('with-coverage')
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/pyproject.toml b/pyproject.toml
2+
index 85c9214..90c6da8 100644
3+
--- a/pyproject.toml
4+
+++ b/pyproject.toml
5+
@@ -1,5 +1,6 @@
6+
[build-system]
7+
requires = ["Cython>=3.0.7", "setuptools", "wheel"]
8+
+build-backend = "setuptools.build_meta:__legacy__"
9+
10+
[tool.cibuildwheel]
11+
build-verbosity = 2
12+
diff --git a/setupinfo.py b/setupinfo.py
13+
index d111128..5ad5a23 100644
14+
--- a/setupinfo.py
15+
+++ b/setupinfo.py
16+
@@ -536,7 +536,7 @@ OPTION_WITH_UNICODE_STRINGS = has_option('with-unicode-strings')
17+
OPTION_WITHOUT_ASSERT = has_option('without-assert')
18+
OPTION_WITHOUT_THREADING = has_option('without-threading')
19+
OPTION_WITHOUT_CYTHON = has_option('without-cython')
20+
-OPTION_WITH_CYTHON = has_option('with-cython')
21+
+OPTION_WITH_CYTHON = True
22+
OPTION_WITH_CYTHON_GDB = has_option('cython-gdb')
23+
OPTION_WITH_REFNANNY = has_option('with-refnanny')
24+
OPTION_WITH_COVERAGE = has_option('with-coverage')
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/pyproject.toml b/pyproject.toml
2+
index e7f6bb6..230f261 100644
3+
--- a/pyproject.toml
4+
+++ b/pyproject.toml
5+
@@ -1,5 +1,6 @@
6+
[build-system]
7+
requires = ["Cython>=3.0.9", "setuptools", "wheel"]
8+
+build-backend = "setuptools.build_meta:__legacy__"
9+
10+
[tool.cibuildwheel]
11+
build-verbosity = 2
12+
diff --git a/setupinfo.py b/setupinfo.py
13+
index 43e283f..d415905 100644
14+
--- a/setupinfo.py
15+
+++ b/setupinfo.py
16+
@@ -564,7 +564,7 @@ OPTION_WITH_UNICODE_STRINGS = has_option('with-unicode-strings')
17+
OPTION_WITHOUT_ASSERT = has_option('without-assert')
18+
OPTION_WITHOUT_THREADING = has_option('without-threading')
19+
OPTION_WITHOUT_CYTHON = has_option('without-cython')
20+
-OPTION_WITH_CYTHON = has_option('with-cython')
21+
+OPTION_WITH_CYTHON = True
22+
OPTION_WITH_CYTHON_GDB = has_option('cython-gdb')
23+
OPTION_WITH_REFNANNY = has_option('with-refnanny')
24+
OPTION_WITH_COVERAGE = has_option('with-coverage')
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/pyproject.toml b/pyproject.toml
2+
index 1720657..b3cd9ab 100644
3+
--- a/pyproject.toml
4+
+++ b/pyproject.toml
5+
@@ -1,5 +1,6 @@
6+
[build-system]
7+
requires = ["Cython>=3.0.10", "setuptools", "wheel"]
8+
+build-backend = "setuptools.build_meta:__legacy__"
9+
10+
[tool.cibuildwheel]
11+
build-verbosity = 2
12+
diff --git a/setupinfo.py b/setupinfo.py
13+
index 97e3399..9079171 100644
14+
--- a/setupinfo.py
15+
+++ b/setupinfo.py
16+
@@ -563,7 +563,7 @@ OPTION_WITH_UNICODE_STRINGS = has_option('with-unicode-strings')
17+
OPTION_WITHOUT_ASSERT = has_option('without-assert')
18+
OPTION_WITHOUT_THREADING = has_option('without-threading')
19+
OPTION_WITHOUT_CYTHON = has_option('without-cython')
20+
-OPTION_WITH_CYTHON = has_option('with-cython')
21+
+OPTION_WITH_CYTHON = True
22+
OPTION_WITH_CYTHON_GDB = has_option('cython-gdb')
23+
OPTION_WITH_REFNANNY = has_option('with-refnanny')
24+
OPTION_WITH_COVERAGE = has_option('with-coverage')
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/pyproject.toml b/pyproject.toml
2+
index f2edb28..259ed3c 100644
3+
--- a/pyproject.toml
4+
+++ b/pyproject.toml
5+
@@ -1,5 +1,6 @@
6+
[build-system]
7+
requires = ["Cython>=3.0.11, < 3.1.0", "setuptools", "wheel"]
8+
+build-backend = "setuptools.build_meta:__legacy__"
9+
10+
[tool.cibuildwheel]
11+
build-verbosity = 1
12+
diff --git a/setupinfo.py b/setupinfo.py
13+
index 2aa3dca..e715c86 100644
14+
--- a/setupinfo.py
15+
+++ b/setupinfo.py
16+
@@ -557,7 +557,7 @@ OPTION_WITH_UNICODE_STRINGS = has_option('with-unicode-strings')
17+
OPTION_WITHOUT_ASSERT = has_option('without-assert')
18+
OPTION_WITHOUT_THREADING = has_option('without-threading')
19+
OPTION_WITHOUT_CYTHON = has_option('without-cython')
20+
-OPTION_WITH_CYTHON = has_option('with-cython')
21+
+OPTION_WITH_CYTHON = True
22+
OPTION_WITH_CYTHON_GDB = has_option('cython-gdb')
23+
OPTION_WITH_REFNANNY = has_option('with-refnanny')
24+
OPTION_WITH_COVERAGE = has_option('with-coverage')

graalpython/lib-graalpython/patches/metadata.toml

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,38 @@ patch = 'llvmlite.patch'
236236
license = 'BSD-2-Clause'
237237

238238
[[lxml.rules]]
239-
version = '== 5.3.0'
239+
version = '>= 5.3.2, <= 5.4.0'
240+
patch = 'lxml-5.4.0.patch'
241+
license = 'BSD-3-Clause'
242+
243+
[[lxml.rules]]
244+
version = '>= 5.3.0, < 5.3.2'
240245
patch = 'lxml-5.3.0.patch'
241246
license = 'BSD-3-Clause'
242247

243248
[[lxml.rules]]
244-
version = '== 4.9.1'
245-
patch = 'lxml-4.9.1.patch'
249+
version = '== 5.2.*'
250+
patch = 'lxml-5.2.patch'
251+
license = 'BSD-3-Clause'
252+
253+
[[lxml.rules]]
254+
version = '== 5.1.1'
255+
patch = 'lxml-5.1.1.patch'
256+
license = 'BSD-3-Clause'
257+
258+
[[lxml.rules]]
259+
version = '== 5.1.0'
260+
patch = 'lxml-5.1.0.patch'
261+
license = 'BSD-3-Clause'
262+
263+
[[lxml.rules]]
264+
version = '== 5.0.*'
265+
patch = 'lxml-5.0.patch'
266+
license = 'BSD-3-Clause'
267+
268+
[[lxml.rules]]
269+
version = '>= 4.9, < 5'
270+
patch = 'lxml-4.9.patch'
246271
license = 'BSD-3-Clause'
247272

248273
# Patch already upstreamed, keeping it around for older versions

0 commit comments

Comments
 (0)