Skip to content

Commit 51ee0c3

Browse files
committed
[FIX] packaging: add qrcode package to docker file
After the Odoo package is built, the package.py script uses a Docker image to test the package. After that python3-qrcode was added as a dependency for the package in 2ff49c5 , it revealed some issues. A missing cli parameter and a forgotten '&&' in the Dockerfile prevented the installation of the depending packages. Also, the script shebang was wrong by launching python2. Finally, the fact that python3-xlwt is missing in Debian stretch was highlighted. With this commit, the python3-xlwt is explicitly removed from the dependencies and the documentation is updated accordingly. closes odoo#28807
1 parent 7c3d5dc commit 51ee0c3

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

debian/py3dist-overrides

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
xlwt

doc/setup/install.rst

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,21 +169,15 @@ Or ``dpkg``:
169169
This will install Odoo as a service, create the necessary PostgreSQL_ user
170170
and automatically start the server.
171171

172-
.. warning:: The 3 following python packages are only suggested by the Debian package.
173-
Those packages are not available in Ubuntu Xenial (16.04).
172+
.. warning:: The python3-xlwt Debian package does not exists in Debian Stretch nor Ubuntu 18.04.
173+
This python module is needed to export into xls format.
174174

175-
* python3-vobject: Used in calendars to produce ical files.
176-
* python3-pyldap: Used to authenticat users with LDAP.
177-
* python3-qrcode: Used by the hardware driver for ESC/POS
178-
179-
If you need one or all of the packages mentioned in the above warning, you can install them manually.
175+
If you need the feature, you can install it manually.
180176
One way to do it, is simply using pip3 like this:
181177

182178
.. code-block:: console
183179
184-
$ sudo pip3 install vobject qrcode
185-
$ sudo apt install libldap2-dev libsasl2-dev
186-
$ sudo pip3 install pyldap
180+
$ sudo pip3 install xlwt
187181
188182
.. warning:: Debian 9 and Ubuntu do not provide a package for the python module
189183
num2words.

setup/package.dfdebian

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENV LC_ALL C.UTF-8
1515

1616
RUN apt-get update -qq && \
1717
apt-get upgrade -qq -y && \
18-
apt-get install \
18+
apt-get install -qq -y\
1919
adduser \
2020
postgresql \
2121
postgresql-client \
@@ -40,6 +40,7 @@ RUN apt-get update -qq && \
4040
python3-pydot \
4141
python3-pyparsing \
4242
python3-pypdf2 \
43+
python3-qrcode \
4344
python3-reportlab \
4445
python3-requests \
4546
python3-serial \
@@ -49,7 +50,7 @@ RUN apt-get update -qq && \
4950
python3-vatnumber \
5051
python3-vobject \
5152
python3-werkzeug \
52-
python3-xlsxwriter \
53+
python3-xlsxwriter && \
5354
rm -rf /var/lib/apt/lists/*
5455

5556
RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc

setup/package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python2
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33
# Part of Odoo. See LICENSE file for full copyright and licensing details.
44
from __future__ import print_function

0 commit comments

Comments
 (0)