From d42998f1c9eacfc5a40655792d78188a922108f3 Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Mon, 9 Sep 2024 14:19:52 +0200
Subject: [PATCH] feat: fix image layout

---
 16.0/base_requirements.txt | 88 +++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/16.0/base_requirements.txt b/16.0/base_requirements.txt
index 8cf629c3..4145be63 100644
--- a/16.0/base_requirements.txt
+++ b/16.0/base_requirements.txt
@@ -1,45 +1,47 @@
-# Odoo dependencies
-Babel==2.16.0
-chardet==5.2.0
-decorator==5.1.1
-docutils==0.21.2
-ebaysdk==2.2.0
-freezegun==1.5.1
-gevent==24.2.1
-greenlet==3.0.3
-html2text==2024.2.26
-idna==3.8
-Jinja2==3.1.4 
-libsass==0.23.0
-lxml_html_clean==0.2.2
-lxml==5.3.0
-Mako==1.3.5   # XXX no longer in the official requirements.txt
-MarkupSafe==2.1.5
-num2words==0.5.13
-ofxparse==0.21
-passlib==1.7.4
-Pillow==10.4.0 
-polib==1.2.0
-psutil==6.0.0
-psycopg2==2.9.9
-pydot==3.0.1
-python-ldap==3.4.4
-PyPDF2==3.0.1
+# The officially supported versions of the following packages are their
+# python3-* equivalent distributed in Ubuntu 22.04 and Debian 11
+Babel==2.9.1  # min version = 2.6.0 (Focal with security backports)
+chardet==4.0.0
+cryptography==42.0.8 ; python_version >= '3.12'  # (Noble) min 41.0.7, pinning 42.0.8 for security fixes
+decorator==4.4.2
+docutils==0.16
+ebaysdk==2.1.5
+freezegun==0.3.15; python_version >= '3.8'
+gevent==24.2.1 ; sys_platform != 'win32' and python_version >= '3.12'  # (Noble)
+greenlet==3.0.3 ; sys_platform != 'win32' and python_version >= '3.12'  # (Noble)
+idna==2.10
+Jinja2==3.1.2 ; python_version > '3.10'
+libsass==0.22.0 ; python_version >= '3.12'  # (Noble) Mostly to have a wheel package
+lxml==5.2.1; python_version >= '3.12' # (Noble - removed html clean)
+lxml-html-clean; python_version >= '3.12' # (Noble - removed from lxml, unpinned for futur security patches)
+MarkupSafe==2.1.5 ; python_version >= '3.12'  # (Noble) Mostly to have a wheel package
+num2words==0.5.9
+ofxparse==0.21; python_version > '3.9'  # (Jammy)
+passlib==1.7.4 # min version = 1.7.2 (Focal with security backports)
+Pillow==10.2.0 ; python_version >= '3.12'  # (Noble) Mostly to have a wheel package
+polib==1.1.0
+psutil==5.9.8 ; python_version >= '3.12'  # (Noble) Mostly to have a wheel package
+psycopg2==2.9.9 ; python_version >= '3.12'  # (Noble) Mostly to have a wheel package
+pydot==1.4.2
+pyopenssl==24.1.0 ; python_version >= '3.12' # (Noble) min 23.2.0, pinned for compatibility with cryptography==42.0.8 and security patches
+PyPDF2==2.12.1 ; python_version > '3.10'
 pyserial==3.5
-python-dateutil==2.9.0
-pytz==2024.1
-pyusb==1.2.1
-qrcode==7.4.2
-reportlab==4.2.2
-requests==2.32.3
-zeep==4.2.1
-python-stdnum==1.20
-vobject==0.9.7
-Werkzeug==3.0.4
-XlsxWriter==3.2.0
+python-dateutil==2.8.1
+python-ldap==3.4.4 ; sys_platform != 'win32' and python_version >= '3.12'  # (Noble) Mostly to have a wheel package
+python-stdnum==1.16
+pytz  # no version pinning to avoid OS perturbations
+pyusb==1.2.1 ; python_version > '3.10'
+qrcode==6.1
+reportlab==4.1.0 ; python_version >= '3.12' # (Noble) Mostly to have a wheel package
+requests==2.31.0 ; python_version >= '3.12' # (Noble) Compatibility with i
+rl-renderPM==4.0.3 ; sys_platform == 'win32' and python_version >= '3.12'  # Needed by reportlab 4.1.0 but included in deb package
+urllib3==2.0.7  ; python_version >= '3.12'  # (Noble) Compatibility with cryptography
+vobject==0.9.6.1
+Werkzeug==2.0.2 ; python_version > '3.9'  # (Jammy)
+xlrd==1.2.0; python_version >= '3.8'
+XlsxWriter==1.1.2
 xlwt==1.3.0
-xlrd==2.0.1
-pyOpenSSL==24.2.1
+zeep==4.0.0
 
 setuptools==73.0.1
 
@@ -50,7 +52,6 @@ html5lib==1.1
 odfpy==1.4.1
 pyinotify==0.9.6
 simplejson==3.19.3
-urllib3==2.2.2
 
 # Migration tools
 marabunta==0.12.0
@@ -74,8 +75,9 @@ attrs==24.2.0
 beautifulsoup4==4.12.3
 future==1.0.0
 mccabe==0.7.0
-more-itertools==10.4.0
-pbr==6.0.0
+more-itertools==10.5.0
+pathtools==0.1.2
+pbr==6.1.0
 pexpect==4.9.0
 ptyprocess==0.7.0
 py==1.11.0