Skip to content

Commit 640a5bc

Browse files
committed
update expat for all versions
1 parent 78fd96e commit 640a5bc

File tree

1 file changed

+2
-28
lines changed

1 file changed

+2
-28
lines changed

relenv/build/windows.py

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
runcmd,
3030
update_ensurepip,
3131
)
32-
from ..common import WIN32, Version, arches
32+
from ..common import WIN32, arches
3333

3434
log = logging.getLogger(__name__)
3535

@@ -326,31 +326,6 @@ def update_expat(dirs: Dirs, env: EnvMapping) -> None:
326326
json.dump(data, f, indent=2)
327327

328328

329-
def update_expat_check(env: EnvMapping) -> bool:
330-
"""
331-
Check if the given python version should get an updated libexpat.
332-
333-
Patch libexpat on these versions and below:
334-
- 3.9.23
335-
- 3.10.18
336-
- 3.11.13
337-
- 3.12.11
338-
- 3.13.7
339-
"""
340-
relenv_version = Version(env["RELENV_PY_VERSION"])
341-
if relenv_version.minor == 9 and relenv_version.micro <= 23:
342-
return True
343-
elif relenv_version.minor == 10 and relenv_version.micro <= 18:
344-
return True
345-
elif relenv_version.minor == 11 and relenv_version.micro <= 13:
346-
return True
347-
elif relenv_version.minor == 12 and relenv_version.micro <= 11:
348-
return True
349-
elif relenv_version.minor == 13 and relenv_version.micro <= 7:
350-
return True
351-
return False
352-
353-
354329
def build_python(env: EnvMapping, dirs: Dirs, logfp: IO[str]) -> None:
355330
"""
356331
Run the commands to build Python.
@@ -372,8 +347,7 @@ def build_python(env: EnvMapping, dirs: Dirs, logfp: IO[str]) -> None:
372347

373348
update_xz(dirs=dirs, env=env)
374349

375-
if update_expat_check(env=env):
376-
update_expat(dirs=dirs, env=env)
350+
update_expat(dirs=dirs, env=env)
377351

378352
arch_to_plat = {
379353
"amd64": "x64",

0 commit comments

Comments
 (0)