mirror of
https://github.com/kovidgoyal/calibre.git
synced 2026-03-03 07:30:01 -05:00
Bump the versions of libxml2 and lxml
No longer need the lxml workaround on windows
This commit is contained in:
parent
d68e11b2b9
commit
2a96578a0d
@ -321,8 +321,8 @@
|
||||
{
|
||||
"name": "libxml2",
|
||||
"unix": {
|
||||
"filename": "libxml2-2.12.1.tar.xz",
|
||||
"hash": "sha256:8982b9ccdf7f456e30d8f7012d50858c6623e495333b6191def455c7e95427eb",
|
||||
"filename": "libxml2-2.12.6.tar.xz",
|
||||
"hash": "sha256:889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb",
|
||||
"urls": ["https://download.gnome.org/sources/libxml2/2.12/{filename}"]
|
||||
}
|
||||
},
|
||||
@ -668,8 +668,8 @@
|
||||
{
|
||||
"name": "lxml",
|
||||
"unix": {
|
||||
"filename": "lxml-4.9.3.tar.gz",
|
||||
"hash": "sha256:48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c",
|
||||
"filename": "lxml-5.2.1.tar.gz",
|
||||
"hash": "sha256:3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306",
|
||||
"urls": ["pypi"]
|
||||
}
|
||||
},
|
||||
@ -1016,6 +1016,15 @@
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"name": "lxml-html-clean",
|
||||
"unix": {
|
||||
"filename": "lxml_html_clean-0.1.1-py3-none-any.whl",
|
||||
"hash": "sha256:58c04176593c9caf72ec92e033d2f38859e918b3eff0cc0f8051ad27dc2ab8ef",
|
||||
"urls": ["pypi"]
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"name": "ply",
|
||||
"comment": "Needed for sip (build time dependency)",
|
||||
|
||||
@ -60,16 +60,6 @@ def set_quit():
|
||||
builtins.exit = _sitebuiltins.Quitter('exit', eof)
|
||||
|
||||
|
||||
def workaround_lxml_bug():
|
||||
# Without calling xmlInitParser() import lxml causes a segfault
|
||||
import ctypes
|
||||
x = ctypes.WinDLL('libxml2.dll')
|
||||
x.xmlInitParser()
|
||||
workaround_lxml_bug.libxml2 = x
|
||||
from lxml import etree
|
||||
del etree
|
||||
|
||||
|
||||
def main():
|
||||
sys.meta_path.insert(0, PydImporter())
|
||||
os.add_dll_directory(os.path.abspath(os.path.join(sys.app_dir, 'app', 'bin')))
|
||||
@ -85,8 +75,6 @@ def main():
|
||||
set_helper()
|
||||
set_quit()
|
||||
|
||||
workaround_lxml_bug()
|
||||
|
||||
return run_entry_point()
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user