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, adapt documentation #9116

Closed
wants to merge 1 commit into from
Closed

Conversation

Xavier-Do
Copy link
Collaborator

@Xavier-Do Xavier-Do commented May 2, 2024

The debian/controll changed making the previous sed outdated, adapt to use a script for an easier onboarding and mainteance.

Also, warn user that pip option is not adviced.

@robodoo
Copy link
Collaborator

robodoo commented May 2, 2024

@Xavier-Do Xavier-Do marked this pull request as ready for review May 28, 2024 09:57
@Xavier-Do Xavier-Do requested a review from AntoineVDV May 28, 2024 09:57
@C3POdoo C3POdoo requested review from a team May 28, 2024 10:12
@Xavier-Do
Copy link
Collaborator Author

robodoo r+

robodoo pushed a commit to odoo/odoo 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 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 to odoo/odoo 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 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
@Xavier-Do Xavier-Do changed the title [wip] [FIX] packaging, adapt documentation May 30, 2024
content/administration/on_premise/source.rst Show resolved Hide resolved
content/administration/on_premise/source.rst Show resolved Hide resolved
On Debian/Ubuntu, the following commands should install the required packages:

.. code-block:: console

$ cd /CommunityPath
$ sed -n -e '/^Depends:/,/^Pre/ s/ python3-\(.*\),/python3-\1/p' debian/control | sudo xargs apt-get install -y
$ cd odoo #CommunityPath
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CommunityPath placeholder is explained above and presented in the /CommunityPath format in commands in many other places on this page; let's keep it.

Suggested change
$ cd odoo #CommunityPath
$ cd /CommunityPath

It could maybe be made clearer, but then it should be done for the entire page at once, not just this one command block.

Comment on lines +289 to +291

Using pip may lead to security issue and broken dependencies, only do this if you
know what you rare doing.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • removed extra line
  • issues
  • , -> ;
  • rare -> are
Suggested change
Using pip may lead to security issue and broken dependencies, only do this if you
know what you rare doing.
Using pip may lead to security issues and broken dependencies; only do this if you
know what you are doing.

@fw-bot
Copy link
Collaborator

fw-bot commented Jun 1, 2024

@fw-bot
Copy link
Collaborator

fw-bot commented Jun 2, 2024

@Xavier-Do 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
Collaborator

fw-bot commented Jun 3, 2024

@Xavier-Do 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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants