Skip to content

Commit 2ff49c5

Browse files
committed
[FIX] packaging: make Debian package depends on qrcode and vobject
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
1 parent 8ca728b commit 2ff49c5

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ Depends:
3535
python3-pydot,
3636
python3-pyparsing,
3737
python3-pypdf2,
38+
python3-qrcode,
3839
python3-reportlab,
3940
python3-requests,
4041
python3-suds,
4142
python3-tz,
4243
python3-vatnumber,
44+
python3-vobject,
4345
python3-werkzeug,
4446
python3-xlsxwriter,
4547
Conflicts: tinyerp-server, openerp-server, openerp-web, openerp
@@ -48,8 +50,6 @@ Recommends:
4850
${python3:Recommends},
4951
postgresql,
5052
python3-pyldap,
51-
python3-qrcode,
52-
python3-vobject,
5353
Description: Open Source Apps To Grow Your Business
5454
Odoo, formerly known as OpenERP, is a suite of open-source business apps
5555
written in Python and released under the LGPLv3 license. This suite of

debian/py3dist-overrides

Lines changed: 0 additions & 3 deletions
This file was deleted.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ def py2exe_options():
151151
'psutil', # windows binary code.google.com/p/psutil/downloads/list
152152
'psycopg2 >= 2.2',
153153
'pydot',
154-
'pyldap', # optional
155154
'pyparsing',
156155
'pypdf2',
157156
'pyserial',
@@ -170,6 +169,7 @@ def py2exe_options():
170169
],
171170
python_requires='>=3.5',
172171
extras_require={
172+
'ldap': ['pyldap'],
173173
'SSL': ['pyopenssl'],
174174
},
175175
tests_require=[

0 commit comments

Comments
 (0)