From e3584c6656d7009e91757a4ced24dc42e9997e87 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Fri, 2 Aug 2024 12:37:48 +0000
Subject: [PATCH] [FIX] packaging: add openpyxl dependency

As xlrd 2.0 removed support for xlsx and since #169482 the openpyxl lib
is needed on Noble installations to import xlsx files.

closes odoo/odoo#176657

X-original-commit: 4840a470b2abfac299a35cc2cfc4b3d0b40105b2
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
---
 debian/control         | 1 +
 requirements.txt       | 2 ++
 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 9721bc88d60bc..e4f2dc7e53ebe 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Depends:
  python3-lxml-html-clean | python3-lxml,
  python3-num2words,
  python3-ofxparse,
+ python3-openpyxl,
  python3-passlib,
  python3-polib,
  python3-psutil,
diff --git a/requirements.txt b/requirements.txt
index a95fd24a28ac9..ba6b65c77489b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -40,6 +40,8 @@ MarkupSafe==2.1.5 ; python_version >= '3.12'  # (Noble) Mostly to have a wheel p
 num2words==0.5.10 ; python_version < '3.12'  # (Jammy / Bookworm)
 num2words==0.5.13 ; python_version >= '3.12' 
 ofxparse==0.21
+openpyxl==3.0.9 ; python_version < '3.12'
+openpyxl==3.1.2 ; python_version >= '3.12'
 passlib==1.7.4 # min version = 1.7.2 (Focal with security backports)
 Pillow==9.0.1 ; python_version <= '3.10'
 Pillow==9.4.0 ; python_version > '3.10' and python_version < '3.12'
diff --git a/setup.py b/setup.py
index 0a07dc4ef589b..899994b96868d 100644
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,7 @@
         'MarkupSafe',
         'num2words',
         'ofxparse',
+        'openpyxl',
         'passlib',
         'pillow',  # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
         'polib',
diff --git a/setup/package.dfdebian b/setup/package.dfdebian
index b800f146b7bd4..9f5ec73d74d88 100644
--- a/setup/package.dfdebian
+++ b/setup/package.dfdebian
@@ -36,6 +36,7 @@ RUN apt-get update -qq &&  \
         python3-libsass \
         python3-lxml \
         python3-ofxparse \
+        python3-openpyxl \
         python3-passlib \
         python3-polib \
         python3-psutil \
diff --git a/setup/package.dffedora b/setup/package.dffedora
index e7ad360df20e1..d8221500a824b 100644
--- a/setup/package.dffedora
+++ b/setup/package.dffedora
@@ -35,6 +35,7 @@ RUN dnf update -d 0 -e 0 -y && \
         python3-mock \
         python3-num2words \
         python3-ofxparse.noarch \
+        python3-openpyxl \
         python3-passlib \
         python3-pillow \
         python3-polib \