From 951634f22a9d68ce5ce595d5bcd0606969727f70 Mon Sep 17 00:00:00 2001 From: vrenaville Date: Tue, 10 Sep 2024 16:21:42 +0200 Subject: [PATCH] feat: fix instance code --- 14.0/base_requirements.txt | 4 +- 17.0/base_requirements.txt | 82 +++++++++++++++++++------------------- 2 files changed, 42 insertions(+), 44 deletions(-) diff --git a/14.0/base_requirements.txt b/14.0/base_requirements.txt index 1bc46381..1b9316bf 100644 --- a/14.0/base_requirements.txt +++ b/14.0/base_requirements.txt @@ -10,8 +10,8 @@ docutils==0.14 ebaysdk==2.1.5 freezegun==0.3.15; python_version >= '3.8' # gevent==1.1.2 ; sys_platform != 'win32' and python_version < '3.7' -gevent==20.9.0 ; python_version >= '3.8' -greenlet==0.4.17 ; python_version > '3.7' +gevent==22.10.2 ; python_version >= '3.8' +greenlet==2.0.2 ; python_version > '3.7' html2text==2018.1.9 idna==2.6 Jinja2==2.11.3; python_version < '3.8' # official 2.10.1 diff --git a/17.0/base_requirements.txt b/17.0/base_requirements.txt index 899edb4b..1855f5ad 100644 --- a/17.0/base_requirements.txt +++ b/17.0/base_requirements.txt @@ -1,49 +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 -geoip2==4.8.0 -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 +Babel==2.10.3 ; python_version >= '3.11' +chardet==5.2.0 ; python_version >= '3.11' +cryptography==42.0.8 ; python_version >= '3.12' # (Noble) min 41.0.7, pinning 42.0.8 for security fixes +decorator==5.1.1 ; python_version >= '3.11' +docutils==0.20.1 ; python_version >= '3.11' +ebaysdk==2.1.5 +freezegun==1.2.1 ; python_version >= '3.11' +geoip2==2.9.0 +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==3.6 ; python_version >= '3.12' +Jinja2==3.1.2 ; python_version > '3.10' +libsass==0.22.0 ; python_version >= '3.11' # (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.13 ; python_version >= '3.12' 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 +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.1 +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 +python-dateutil==2.8.2 ; python_version >= '3.11' +python-ldap==3.4.4 ; sys_platform != 'win32' and python_version >= '3.12' # (Noble) Mostly to have a wheel package +python-stdnum==1.19 ; python_version >= '3.11' +pytz # no version pinning to avoid OS perturbations pyusb==1.2.1 -qrcode==7.4.2 -reportlab==4.2.2 -requests==2.32.3 -rjsmin==1.2.2 -urllib3==2.2.2 -zeep==4.2.1 -python-stdnum==1.20 -vobject==0.9.7 -Werkzeug==3.0.4 -XlsxWriter==3.2.0 +qrcode==7.4.2 ; python_version >= '3.11' +reportlab==4.1.0 ; python_version >= '3.12' # (Noble) Mostly to have a wheel package +requests==2.31.0 ; python_version >= '3.11' # (Noble) +rjsmin==1.2.0 ; python_version >= '3.11' +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==3.0.1 ; python_version >= '3.12' # (Noble) Avoid deprecation warnings +xlrd==2.0.1 ; python_version >= '3.12' +XlsxWriter==3.1.9 ; python_version >= '3.12' xlwt==1.3.0 -xlrd==2.0.1 -pyOpenSSL==24.2.1 - +zeep==4.2.1 ; python_version >= '3.11' setuptools==73.0.1 # Not part of official requirements, but used by some addons