From e3bc2a90b5bbd042856f4774e20c75ffb8ac4cc4 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 10 Mar 2023 08:06:49 +0000 Subject: [PATCH] [FIX] requirements: adapt for python 3.11 Although Odoo 16.0 was already adapted to work with python 3.11 in 67c7cea , the requirements were left untouched. The purpose of this previous work was to prepare for the next Debian Bookworm release. With this commit, the requirements are updated to match the python packages versions from Bookworm. That way, it will allow people who installs Odoo in Python 3.11 environments by using the requirements should be able to do so. Closes #114195 X-original-commit: fbe4932cd583a2cc019644807a7ea248d34eec80 Part-of: odoo/odoo#115618 --- requirements.txt | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9e34960fd0b..35cf7c3bfc6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,36 +9,47 @@ freezegun==0.3.15; python_version >= '3.8' geoip2==2.9.0 gevent==1.5.0 ; python_version == '3.7' gevent==20.9.0 ; python_version > '3.7' and python_version <= '3.9' -gevent==21.8.0 ; python_version > '3.9' # (Jammy) +gevent==21.8.0 ; python_version > '3.9' and python_version <= '3.10' # (Jammy) +gevent==22.10.2; python_version > '3.10' greenlet==0.4.15 ; python_version == '3.7' greenlet==0.4.17 ; python_version > '3.7' and python_version <= '3.9' -greenlet==1.1.2 ; python_version > '3.9' # (Jammy) +greenlet==1.1.2 ; python_version > '3.9' and python_version <= '3.10' # (Jammy) +greenlet==2.0.2 ; python_version > '3.10' idna==2.8 Jinja2==2.11.3 # min version = 2.10.1 (Focal - with security backports) -libsass==0.18.0 -lxml==4.6.5 # min version = 4.5.0 (Focal - with security backports) -MarkupSafe==1.1.0 +libsass==0.20.1 +lxml==4.6.5 ; python_version <= '3.10' # min version = 4.5.0 (Focal - with security backports) +lxml==4.9.2 ; python_version > '3.10' +MarkupSafe==1.1.1 ; python_version <= '3.10' +MarkupSafe==2.1.2 ; python_version > '3.10' num2words==0.5.6 ofxparse==0.19; python_version <= '3.9' ofxparse==0.21; python_version > '3.9' # (Jammy) passlib==1.7.3 # min version = 1.7.2 (Focal with security backports) -Pillow==9.0.1 # min version = 7.0.0 (Focal with security backports) +Pillow==9.0.1 ; python_version <= '3.10' # min version = 7.0.0 (Focal with security backports) +Pillow==9.4.0 ; python_version > '3.10' polib==1.1.0 -psutil==5.6.7 # min version = 5.5.1 (Focal with security backports) -psycopg2==2.7.7; sys_platform != 'win32' and python_version < '3.8' -psycopg2==2.8.6; sys_platform == 'win32' or python_version >= '3.8' +psutil==5.8.0 ; python_version <= '3.10' +psutil==5.9.4 ; python_version > '3.10' +psycopg2==2.7.7 ; sys_platform != 'win32' and python_version < '3.8' +psycopg2==2.8.6 ; sys_platform != 'win32' and python_version >= '3.8'and python_version <= '3.10' +psycopg2==2.8.6 ; sys_platform == 'win32' and python_version < '3.10' +psycopg2==2.9.5 ; python_version > '3.10' or ( sys_platform == 'win32' and python_version == '3.10') pydot==1.4.1 pyopenssl==19.0.0 -PyPDF2==1.26.0 +PyPDF2==1.26.0 ; python_version <= '3.10' +PyPDF2==2.12.1 ; python_version > '3.10' pypiwin32 ; sys_platform == 'win32' pyserial==3.4 python-dateutil==2.7.3 python-ldap==3.4.0 ; sys_platform != 'win32' # min version = 3.2.0 (Focal with security backports) python-stdnum==1.13 pytz==2019.3 -pyusb==1.0.2 +pyusb==1.0.2 ; python_version <= '3.10' +pyusb==1.2.1 ; python_version > '3.10' qrcode==6.1 -reportlab==3.5.59 # version < 3.5.54 are not compatible with Pillow 8.1.2 and 3.5.59 is bullseye +reportlab==3.5.59 ; python_version <= '3.10' # version < 3.5.54 are not compatible with Pillow 8.1.2 and 3.5.59 is bullseye +reportlab==3.6.12 ; python_version > '3.10' requests==2.25.1 # versions < 2.25 aren't compatible w/ urllib3 1.26. Bullseye = 2.25.1. min version = 2.22.0 (Focal) urllib3==1.26.5 # indirect / min version = 1.25.8 (Focal with security backports) vobject==0.9.6.1