-
Notifications
You must be signed in to change notification settings - Fork 23.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[FIX] packaging: lxml_html_clean_split #163788
Conversation
7a43f3b
to
36a282a
Compare
36a282a
to
4a067f9
Compare
6bef500
to
278035e
Compare
91ed094
to
fb52193
Compare
lxml.hml.clean was moved to a separate package starting in lxml 5.2 The requirements and debian control needs to be adapted to install the new package in ubuntu noble (and after ubuntu noble only) The solution was to use fallback to try to install lxml_html_clean if it exists (noble) and fallback on lxml if not. The script use in the documentation and available in more recent version will take all first packge of the debian conrtol, meaning that after this change it won't work in distribution not having lxml_html_clean. The script is adapted to use fallback in apt-install command Debian control: font1 | font2, package_1, package_noble | package_fallback, Before: apt install font1 package package_noble After: apt install font1|font2 package package_noble|package_fallback
fb52193
to
fedcc27
Compare
robodoo r+ |
@Xavier-Do @d-fence linked pull request(s) odoo/documentation#9116 not ready. Linked PRs are not staged until all of them are ready. |
lxml.hml.clean was moved to a separate package starting in lxml 5.2 The requirements and debian control needs to be adapted to install the new package in ubuntu noble (and after ubuntu noble only) The solution was to use fallback to try to install lxml_html_clean if it exists (noble) and fallback on lxml if not. The script use in the documentation and available in more recent version will take all first packge of the debian conrtol, meaning that after this change it won't work in distribution not having lxml_html_clean. The script is adapted to use fallback in apt-install command Debian control: font1 | font2, package_1, package_noble | package_fallback, Before: apt install font1 package package_noble After: apt install font1|font2 package package_noble|package_fallback closes #163788 Related: odoo/documentation#9116 Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
closes #9116 Related: odoo/odoo#163788 Signed-off-by: Xavier Dollé (xdo) <xdo@odoo.com>
lxml.hml.clean was moved to a separate package starting in lxml 5.2 The requirements and debian control needs to be adapted to install the new package in ubuntu noble (and after ubuntu noble only) The solution was to use fallback to try to install lxml_html_clean if it exists (noble) and fallback on lxml if not. The script use in the documentation and available in more recent version will take all first packge of the debian conrtol, meaning that after this change it won't work in distribution not having lxml_html_clean. The script is adapted to use fallback in apt-install command Debian control: font1 | font2, package_1, package_noble | package_fallback, Before: apt install font1 package package_noble After: apt install font1|font2 package package_noble|package_fallback closes #163788 Related: odoo/documentation#9116 Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
closes #9116 Related: odoo/odoo#163788 Signed-off-by: Xavier Dollé (xdo) <xdo@odoo.com>
@Xavier-Do @d-fence this pull request has forward-port PRs awaiting action (not merged or closed): |
@Xavier-Do @d-fence this pull request has forward-port PRs awaiting action (not merged or closed): |
lxml.hml.clean was moved to a separate package starting in lxml 5.2 The requirements and debian control needs to be adapted to install the new package in ubuntu noble (and after ubuntu noble only) The solution was to use fallback to try to install lxml_html_clean if it exists (noble) and fallback on lxml if not. The script use in the documentation and available in more recent version will take all first packge of the debian conrtol, meaning that after this change it won't work in distribution not having lxml_html_clean. The script is adapted to use fallback in apt-install command Debian control: font1 | font2, package_1, package_noble | package_fallback, Before: apt install font1 package package_noble After: apt install font1|font2 package package_noble|package_fallback closes odoo#163788 Related: odoo/documentation#9116 Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
@Xavier-Do @d-fence this pull request has forward-port PRs awaiting action (not merged or closed): |
Since lxml 5.2 (lxml/lxml@7377868) lxml_html_clean is in another package
We can adapt the requirements after python 3.12 (based on ubuntu 24.04)
We can use | operator in debian/control
We may need to adapt documentation since the current sed script will fail
This pr proposes an alternative script to avoid to use a sed
Current sed:
sed -n -e '/^Depends:/,/^Pre/ s/ python3-\(.*\),/python3-\1/p' debian/control
This sed will fail and give the result
python3-lxml-html-clean | python3-lxml
for the lxml line, we need to remove the spaces