Skip to content

Commit

Permalink
[FIX] packaging: make Debian package depends on qrcode and vobject
Browse files Browse the repository at this point in the history
As stated in issue odoo#27752, some Debian packages are only recommended.
As a consequence, these packages are not installed on the Official
Docker image. In that case, if the user wants to install an Odoo module
that needs one of these package, the Docker container has to be
modified.

python3-qrcode and python3-vobject are now part of the latest Debian
stable (stretch) and the latest Ubuntu LTS (Bionic Beaver).
Also, they are pure python, and very small.

Thus, the Debian package can depends on them.

co-author: @sbidoul
Fixes odoo#27752
Closes odoo#28588
Closes odoo#28371
Closes odoo#28372
  • Loading branch information
d-fence committed Nov 13, 2018
1 parent 8ca728b commit 2ff49c5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ Depends:
python3-pydot,
python3-pyparsing,
python3-pypdf2,
python3-qrcode,
python3-reportlab,
python3-requests,
python3-suds,
python3-tz,
python3-vatnumber,
python3-vobject,
python3-werkzeug,
python3-xlsxwriter,
Conflicts: tinyerp-server, openerp-server, openerp-web, openerp
Expand All @@ -48,8 +50,6 @@ Recommends:
${python3:Recommends},
postgresql,
python3-pyldap,
python3-qrcode,
python3-vobject,
Description: Open Source Apps To Grow Your Business
Odoo, formerly known as OpenERP, is a suite of open-source business apps
written in Python and released under the LGPLv3 license. This suite of
Expand Down
3 changes: 0 additions & 3 deletions debian/py3dist-overrides

This file was deleted.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ def py2exe_options():
'psutil', # windows binary code.google.com/p/psutil/downloads/list
'psycopg2 >= 2.2',
'pydot',
'pyldap', # optional
'pyparsing',
'pypdf2',
'pyserial',
Expand All @@ -170,6 +169,7 @@ def py2exe_options():
],
python_requires='>=3.5',
extras_require={
'ldap': ['pyldap'],
'SSL': ['pyopenssl'],
},
tests_require=[
Expand Down

0 comments on commit 2ff49c5

Please sign in to comment.