Skip to content
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

Closed
wants to merge 1 commit into from

Conversation

Xavier-Do
Copy link
Contributor

@Xavier-Do Xavier-Do commented Apr 29, 2024

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

@Xavier-Do Xavier-Do mentioned this pull request Apr 29, 2024
14 tasks
@robodoo
Copy link
Contributor

robodoo commented Apr 29, 2024

@C3POdoo C3POdoo added the RD research & development, internal work label Apr 29, 2024
@Xavier-Do Xavier-Do changed the title [wip packaging] [FIX] packaging: lxml_html_clean_split Apr 29, 2024
@Xavier-Do Xavier-Do requested a review from d-fence April 29, 2024 13:34
@Xavier-Do Xavier-Do force-pushed the 15.0-noble-packaging-xdo branch 3 times, most recently from 6bef500 to 278035e Compare May 16, 2024 06:21
@Xavier-Do Xavier-Do marked this pull request as ready for review May 28, 2024 07:57
@Xavier-Do Xavier-Do force-pushed the 15.0-noble-packaging-xdo branch 4 times, most recently from 91ed094 to fb52193 Compare May 28, 2024 09:32
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
@d-fence
Copy link
Contributor

d-fence commented May 28, 2024

robodoo r+

@C3POdoo C3POdoo requested review from a team May 28, 2024 10:12
@robodoo
Copy link
Contributor

robodoo commented May 28, 2024

@Xavier-Do @d-fence linked pull request(s) odoo/documentation#9116 not ready. Linked PRs are not staged until all of them are ready.

robodoo pushed a commit that referenced this pull request May 28, 2024
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>
robodoo pushed a commit to odoo/documentation that referenced this pull request May 28, 2024
closes #9116

Related: odoo/odoo#163788
Signed-off-by: Xavier Dollé (xdo) <xdo@odoo.com>
robodoo pushed a commit that referenced this pull request May 28, 2024
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>
robodoo pushed a commit to odoo/documentation that referenced this pull request May 28, 2024
closes #9116

Related: odoo/odoo#163788
Signed-off-by: Xavier Dollé (xdo) <xdo@odoo.com>
@robodoo robodoo closed this May 28, 2024
@fw-bot
Copy link
Contributor

fw-bot commented Jun 1, 2024

@fw-bot
Copy link
Contributor

fw-bot commented Jun 2, 2024

@Xavier-Do @d-fence this pull request has forward-port PRs awaiting action (not merged or closed):

lohwswilson pushed a commit to lohwswilson/odoo that referenced this pull request Jun 3, 2024
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>
@fw-bot
Copy link
Contributor

fw-bot commented Jun 3, 2024

@Xavier-Do @d-fence this pull request has forward-port PRs awaiting action (not merged or closed):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants