From f78b6d00af4a1502564b5dbd2af7eef88c5fd23a Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 7 Oct 2021 14:04:39 +0000 Subject: [PATCH] [FIX] packaging: add missing dependencies A dependency on python pyopenssl package was added in #61853 and flew under the radar. As this package is pure python, it should not cause any arm. Also, it seems that the gsfonts package is needed on Debian to print things like barcode badges. Previously, the gsfonts package was a dependency of python3-renderm package which is itself a dependency of odoo. The gsfonts dependency was removed in the python3-renderpm Bullseye package. With this commit the gsfonts dependency is set on the odoo Debian package directly. X-original-commit: 248762c80fbf3396d44ea9b55153dcd1d36d3490 Part-of: odoo/odoo#78097 --- debian/control | 2 ++ setup.cfg | 1 + setup.py | 1 + setup/package.dfdebian | 1 + setup/package.dffedora | 1 + 5 files changed, 6 insertions(+) diff --git a/debian/control b/debian/control index 0e1177d906f..fc0aaf7b7a4 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Depends: fonts-inconsolata, fonts-font-awesome, fonts-roboto-unhinted, + gsfonts, libjs-underscore, lsb-base, postgresql-client, @@ -40,6 +41,7 @@ Depends: python3-psutil, python3-psycopg2, python3-pydot, + python3-openssl, python3-pypdf2, python3-qrcode, python3-renderpm, diff --git a/setup.cfg b/setup.cfg index f09984b2ddf..2ac7dce2901 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,6 +31,7 @@ requires = python3-polib python3-pydot python3-PyPDF2 + python3-pyOpenSSL python3-pyserial python3-dateutil python3-pytz diff --git a/setup.py b/setup.py index b3d042d3689..4ca93c2c1c2 100644 --- a/setup.py +++ b/setup.py @@ -41,6 +41,7 @@ setup( 'psutil', # windows binary code.google.com/p/psutil/downloads/list 'psycopg2 >= 2.2', 'pydot', + 'pyopenssl', 'pypdf2', 'pyserial', 'python-dateutil', diff --git a/setup/package.dfdebian b/setup/package.dfdebian index d0a8c2e4981..b23c7aa8d9b 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -40,6 +40,7 @@ RUN apt-get update -qq && \ python3-psutil \ python3-psycopg2 \ python3-pydot \ + python3-openssl \ python3-pypdf2 \ python3-qrcode \ python3-renderpm \ diff --git a/setup/package.dffedora b/setup/package.dffedora index bdff7286988..13cff51a776 100644 --- a/setup/package.dffedora +++ b/setup/package.dffedora @@ -37,6 +37,7 @@ RUN dnf update -d 0 -e 0 -y && \ python3-psycopg2 \ python3-pydot \ python3-pyldap \ + python3-pyOpenSSL \ python3-pyserial \ python3-pytz \ python3-pyusb \