From f81e2cb516b7d723c7735add1fe66c3704caa17c Mon Sep 17 00:00:00 2001 From: vrenaville Date: Thu, 12 Sep 2024 11:53:42 +0200 Subject: [PATCH] feat: package fixing rev + fix test on current image + do not ping on specific patched version of python --- 12.0/Dockerfile | 2 +- 12.0/base_requirements.txt | 118 ++++++++++++++++++---------------- 12.0/extra_requirements.txt | 79 ++++++++++++----------- 13.0/Dockerfile | 2 +- 13.0/base_requirements.txt | 120 ++++++++++++++++++---------------- 13.0/extra_requirements.txt | 78 +++++++++++------------ 14.0/Dockerfile | 2 +- 14.0/base_requirements.txt | 124 ++++++++++++++++++++---------------- 14.0/extra_requirements.txt | 77 +++++++++++----------- 15.0/Dockerfile | 2 +- 15.0/base_requirements.txt | 94 +++++++++++++-------------- 15.0/extra_requirements.txt | 5 +- 16.0/Dockerfile | 2 +- 16.0/base_requirements.txt | 90 +++++++++++++------------- 16.0/extra_requirements.txt | 5 +- 17.0/Dockerfile | 2 +- 17.0/base_requirements.txt | 84 ++++++++++++------------ 17.0/extra_requirements.txt | 4 +- 18 files changed, 456 insertions(+), 434 deletions(-) diff --git a/12.0/Dockerfile b/12.0/Dockerfile index f07123fc..feb1f296 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7.17-slim-bookworm +FROM python:3.7-slim-bookworm MAINTAINER Camptocamp ARG UID=999 # create the working directory and a place to set the logs (if wanted) diff --git a/12.0/base_requirements.txt b/12.0/base_requirements.txt index 6e3f62c2..3c38aaba 100644 --- a/12.0/base_requirements.txt +++ b/12.0/base_requirements.txt @@ -3,55 +3,63 @@ # sys_platform != 'win32' # this is a copy of Odoo dependencies with some bumped versions # unused official dependencies are commented to avoid dependabot alerts -Babel==2.11.0 -chardet==5.0.0 -decorator==5.1.1 -docutils==0.19 -ebaysdk==2.2.0 -gevent==22.10.2 -greenlet==2.0.1 -html2text==2020.1.16 -Jinja2==2.11.3 -libsass==0.22.0 -lxml==4.9.1 -Mako==1.2.4 -MarkupSafe==1.1.1 -mock==4.0.3 -num2words==0.5.12 -ofxparse==0.21 -passlib==1.7.4 -Pillow==9.3.0 -psutil==5.9.4 -psycopg2==2.9.5 -pydot==1.4.2 -pyldap==3.0.0 -pyparsing==3.0.9 -PyPDF2==1.27.12 -pyserial==3.5 -python-dateutil==2.8.2 -pytz==2022.6 -pyusb==1.2.1 -qrcode==7.3.1 -reportlab==3.6.12 -requests==2.28.1 -suds-jurko==0.6 +Babel==2.6.0 +chardet==3.0.4 +decorator==4.3.0 +docutils==0.14 +ebaysdk==2.1.5 +gevent==22.10.2 +greenlet==2.0.2 +html2text==2018.1.9 +Jinja2==3.1.4 # official 2.10.1 +libsass==0.17.0 +# lxml==3.7.1 ; sys_platform != 'win32' and python_version < '3.7' +lxml==4.6.3 ; sys_platform != 'win32' and python_version >= '3.7' # official 4.3.2 +# lxml ; sys_platform == 'win32' +Mako==1.3.5 +MarkupSafe==2.1.5 # official 1.1.0 +mock==2.0.0 +num2words==0.5.10 # official 0.5.6 +ofxparse==0.19 +passlib==1.7.2 # official 1.7.1 +Pillow==8.3.2 ; python_version < '3.7' or sys_platform != 'win32' # official 5.4.1 +# Pillow==6.1.0 ; sys_platform == 'win32' and python_version >= '3.7' +polib==1.1.0 +psutil==5.7.0; sys_platform != 'win32' +psycopg2==2.9.9; sys_platform == 'win32' or python_version >= '3.8' +pydot==1.4.1 +python-ldap==3.2.0; sys_platform != 'win32' # official 3.1.0 +pyparsing==2.2.0 +PyPDF2==1.26.0 +pyserial==3.4 +python-dateutil==2.7.3 +pytz==2024.1 +pyusb==1.0.2 +qrcode==6.1 +reportlab==3.6.9 +requests==2.25.1 # official 2.21.0 +zeep==3.2.0 vatnumber==1.2 vobject==0.9.6.1 -Werkzeug==0.16.1 -XlsxWriter==3.0.3 +Werkzeug==0.16.1 ; sys_platform != 'win32' # official 0.14.1 +# Werkzeug==0.16.0 ; sys_platform == 'win32' +XlsxWriter==1.1.2 xlwt==1.3.* -xlrd==2.0.1 +xlrd==1.1.0 +# pypiwin32 ; sys_platform == 'win32' + +# last version compatible with 2to3 (for vatnumber) +setuptools<58 # Not part of official requirements, but used by some addons -chardet==5.0.0 # colorama==0.3.9 gdata==2.0.18 -html5lib==1.1 +html5lib==1.0.1 odfpy==1.4.1 pyinotify==0.9.6 -python-stdnum==1.18 -simplejson==3.18.0 -urllib3==1.26.11 +python-stdnum==1.13 +simplejson==3.17.0 +urllib3==1.26.7 # Migration tools marabunta==0.12.0 @@ -61,7 +69,7 @@ anthem==0.13.0 # those libs and their dependencies are unpinned # to always test with the last version of it flake8 -pytest +pytest==7.4.4 pluggy coverage pytest-odoo @@ -70,18 +78,18 @@ watchdog # Library dependency argh==0.26.2 -atomicwrites==1.4.1 -attrs==22.1.0 -beautifulsoup4==4.11.1 -future==0.18.2 -mccabe==0.7.0 -more-itertools==9.0.0 -pbr==5.11.0 -pexpect==4.8.0 -ptyprocess==0.7.0 -py==1.11.0 -pycodestyle==2.10.0 -pyflakes==3.0.1 +atomicwrites==1.1.5 +attrs==18.1.0 +beautifulsoup4==4.6.0 +future==0.16.0 +mccabe==0.6.1 +more-itertools==4.2.0 +pathtools==0.1.2 +pbr==4.0.4 +pexpect==4.6.0 +ptyprocess==0.5.2 +py==1.5.3 +pycodestyle==2.5.0 +pyflakes==2.1.1 unicodecsv==0.14.1 -wrapt==1.14.1 -openpyxl==2.6.4 +wrapt==1.10.11 diff --git a/12.0/extra_requirements.txt b/12.0/extra_requirements.txt index 8a9ab9f8..81a7e3bf 100644 --- a/12.0/extra_requirements.txt +++ b/12.0/extra_requirements.txt @@ -1,47 +1,46 @@ # Extra python dependencies -algoliasearch==2.6.2 -Adyen==7.1.1 -cachetools==5.2.0 -cerberus==1.3.4 -boto3==1.26.17 -factur-x==2.3 -invoice2data==0.3.6 -magento==3.1 -mailjet-rest==1.3.4 -openupgradelib==3.4.0 -paramiko==2.12.0 +algoliasearch==1.17.0 +Adyen==1.2.0 +cachetools==2.1.0 +cerberus==1.2 +boto3==1.7.40 +factur-x==0.3 +invoice2data==0.2.74 +magento==3.0 +mailjet-rest==1.3.0 +openupgradelib==1.3.2 +paramiko==2.4.2 parse-accept-language==0.1.2 paypalrestsdk==1.13.1 -phonenumbers==8.13.1 -pyquerystring==1.1 -pyOpenSSL==22.1.0 -pyquerystring==1.1 +phonenumbers==8.9.8 +pyquerystring==1.0.2 +pyOpenSSL==18.0.0 +pyquerystring==1.0.2 pysimplesoap==1.16.2 -requests-mock==1.10.0 +requests-mock==1.5.0 slugify==0.0.1 -stripe==5.0.0 -unidecode==1.3.6 -vcrpy==4.2.1 +stripe==1.82.2 +unidecode==1.0.22 +vcrpy==1.12.0 # Library dependency -asn1crypto==1.5.1 -bcrypt==4.0.1 -botocore==1.29.17 -cffi==1.15.1 -cryptography==38.0.4 -dateparser==1.1.4 -idna==3.4 -jmespath==1.0.1 -multidict==6.0.2 -pdfminer.six==20221105 -pyasn1==0.4.8 -pycparser==2.21 -pycryptodome==3.16.0 -PyNaCl==1.5.0 -pytesseract==0.3.10 -regex==2022.10.31 -s3transfer==0.6.0 -suds-jurko==0.6 -tzlocal==4.2 -Unidecode==1.3.6 -yarl==1.8.1 +asn1crypto==0.24.0 +bcrypt==3.1.4 +botocore==1.10.40 +cffi==1.11.5 +cryptography==2.3.0 +dateparser==0.7.0 +idna==2.7 +jmespath==0.9.3 +multidict==4.3.1 +pdfminer.six==20170720 +pyasn1==0.4.3 +pycparser==2.18 +pycryptodome==3.6.6 +PyNaCl==1.2.1 +pytesseract==0.2.2 +regex==2018.6.9 +s3transfer==0.1.13 +tzlocal==1.5.1 +Unidecode==1.0.22 +yarl==1.2.6 diff --git a/13.0/Dockerfile b/13.0/Dockerfile index 9c0da8c8..be9f6e20 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7.17-slim-bookworm +FROM python:3.9-slim-bookworm MAINTAINER Camptocamp ARG UID=999 # create the working directory and a place to set the logs (if wanted) diff --git a/13.0/base_requirements.txt b/13.0/base_requirements.txt index 59804efc..261062e8 100644 --- a/13.0/base_requirements.txt +++ b/13.0/base_requirements.txt @@ -3,56 +3,64 @@ # sys_platform != 'win32' # this is a copy of Odoo dependencies with some bumped versions # unused official dependencies are commented to avoid dependabot alerts -Babel==2.11.0 -chardet==5.0.0 -decorator==5.1.1 -docutils==0.19 -ebaysdk==2.2.0 -gevent==22.10.2 -greenlet==2.0.1 -html2text==2020.1.16 -Jinja2==3.1.2 -libsass==0.22.0 -lxml==4.9.1 -Mako==1.2.4 -MarkupSafe==2.1.1 -mock==4.0.3 -num2words==0.5.12 -ofxparse==0.21 -passlib==1.7.4 -Pillow==9.3.0 -polib==1.1.1 -psutil==5.9.4 -psycopg2==2.9.5 -pydot==1.4.2 -python-ldap==3.4.3 -pyparsing==3.0.9 -PyPDF2==1.27.12 -pyserial==3.5 -python-dateutil==2.8.2 -pytz==2022.6 -pyusb==1.2.1 -qrcode==7.3.1 -reportlab==3.5.55; python_version >= '3.8' -requests==2.28.1 # official 2.21.0 -zeep==4.2.1 +Babel==2.6.0 +chardet==3.0.4 +decorator==4.3.0 +docutils==0.14 +ebaysdk==2.1.5 +gevent==22.10.2 +greenlet==2.0.2 +html2text==2018.1.9 +Jinja2==3.1.4 # official 2.10.1 +libsass==0.17.0 +# lxml==3.7.1 ; sys_platform != 'win32' and python_version < '3.7' +lxml==4.6.3 ; sys_platform != 'win32' and python_version >= '3.7' # official 4.3.2 +# lxml ; sys_platform == 'win32' +Mako==1.3.5 +MarkupSafe==2.1.5 # official 1.1.0 +mock==2.0.0 +num2words==0.5.10 # official 0.5.6 +ofxparse==0.19 +passlib==1.7.2 # official 1.7.1 +Pillow==8.3.2 ; python_version < '3.7' or sys_platform != 'win32' # official 5.4.1 +# Pillow==6.1.0 ; sys_platform == 'win32' and python_version >= '3.7' +polib==1.1.0 +psutil==5.7.0; sys_platform != 'win32' +psycopg2==2.9.9; sys_platform == 'win32' or python_version >= '3.8' +pydot==1.4.1 +python-ldap==3.2.0; sys_platform != 'win32' # official 3.1.0 +pyparsing==2.2.0 +PyPDF2==1.26.0 +pyserial==3.4 +python-dateutil==2.7.3 +pytz==2024.1 +pyusb==1.0.2 +qrcode==6.1 +reportlab==3.6.9 +requests==2.25.1 # official 2.21.0 +zeep==3.2.0 vatnumber==1.2 vobject==0.9.6.1 -Werkzeug==0.16.1 -# Werkzeug==0.16.0 -XlsxWriter==3.0.3 +Werkzeug==0.16.1 ; sys_platform != 'win32' # official 0.14.1 +# Werkzeug==0.16.0 ; sys_platform == 'win32' +XlsxWriter==1.1.2 xlwt==1.3.* -xlrd==2.0.1 +xlrd==1.1.0 +# pypiwin32 ; sys_platform == 'win32' + +# last version compatible with 2to3 (for vatnumber) +setuptools<58 + # Not part of official requirements, but used by some addons # colorama==0.3.9 gdata==2.0.18 -html5lib==1.1 +html5lib==1.0.1 odfpy==1.4.1 pyinotify==0.9.6 -python-stdnum==1.18 -simplejson==3.18.0 -urllib3==1.26.11 +python-stdnum==1.13 +simplejson==3.17.0 +urllib3==1.26.7 # Migration tools marabunta==0.12.0 @@ -62,7 +70,7 @@ anthem==0.13.0 # those libs and their dependencies are unpinned # to always test with the last version of it flake8 -pytest +pytest==7.4.4 pluggy coverage pytest-odoo @@ -71,18 +79,18 @@ watchdog # Library dependency argh==0.26.2 -atomicwrites==1.4.1 -attrs==22.1.0 -beautifulsoup4==4.11.1 -future==0.18.2 -mccabe==0.7.0 -more-itertools==9.0.0 -pbr==5.11.0 -pexpect==4.8.0 -ptyprocess==0.7.0 -py==1.11.0 -pycodestyle==2.10.0 -pyflakes==3.0.1 +atomicwrites==1.1.5 +attrs==18.1.0 +beautifulsoup4==4.6.0 +future==0.16.0 +mccabe==0.6.1 +more-itertools==4.2.0 +pathtools==0.1.2 +pbr==4.0.4 +pexpect==4.6.0 +ptyprocess==0.5.2 +py==1.5.3 +pycodestyle==2.5.0 +pyflakes==2.1.1 unicodecsv==0.14.1 -wrapt==1.14.1 -openpyxl==2.6.4 +wrapt==1.10.11 diff --git a/13.0/extra_requirements.txt b/13.0/extra_requirements.txt index d5a4c1de..81a7e3bf 100644 --- a/13.0/extra_requirements.txt +++ b/13.0/extra_requirements.txt @@ -1,46 +1,46 @@ # Extra python dependencies -algoliasearch==2.6.2 -Adyen==7.1.1 -cachetools==5.2.0 -cerberus==1.3.4 -boto3==1.26.17 -factur-x==2.3 -invoice2data==0.3.6 -magento==3.1 -mailjet-rest==1.3.4 -openupgradelib==3.4.0 -paramiko==2.12.0 +algoliasearch==1.17.0 +Adyen==1.2.0 +cachetools==2.1.0 +cerberus==1.2 +boto3==1.7.40 +factur-x==0.3 +invoice2data==0.2.74 +magento==3.0 +mailjet-rest==1.3.0 +openupgradelib==1.3.2 +paramiko==2.4.2 parse-accept-language==0.1.2 paypalrestsdk==1.13.1 -phonenumbers==8.13.1 -pyquerystring==1.1 -pyOpenSSL==22.1.0 -pyquerystring==1.1 +phonenumbers==8.9.8 +pyquerystring==1.0.2 +pyOpenSSL==18.0.0 +pyquerystring==1.0.2 pysimplesoap==1.16.2 -requests-mock==1.10.0 +requests-mock==1.5.0 slugify==0.0.1 -stripe==5.0.0 -unidecode==1.3.6 -vcrpy==4.2.1 +stripe==1.82.2 +unidecode==1.0.22 +vcrpy==1.12.0 # Library dependency -asn1crypto==1.5.1 -bcrypt==4.0.1 -botocore==1.29.17 -cffi==1.15.1 -cryptography==38.0.4 -dateparser==1.1.4 -idna==3.4 -jmespath==1.0.1 -multidict==6.0.2 -pdfminer.six==20221105 -pyasn1==0.4.8 -pycparser==2.21 -pycryptodome==3.16.0 -PyNaCl==1.5.0 -pytesseract==0.3.10 -regex==2022.10.31 -s3transfer==0.6.0 -tzlocal==4.2 -Unidecode==1.3.6 -yarl==1.8.1 +asn1crypto==0.24.0 +bcrypt==3.1.4 +botocore==1.10.40 +cffi==1.11.5 +cryptography==2.3.0 +dateparser==0.7.0 +idna==2.7 +jmespath==0.9.3 +multidict==4.3.1 +pdfminer.six==20170720 +pyasn1==0.4.3 +pycparser==2.18 +pycryptodome==3.6.6 +PyNaCl==1.2.1 +pytesseract==0.2.2 +regex==2018.6.9 +s3transfer==0.1.13 +tzlocal==1.5.1 +Unidecode==1.0.22 +yarl==1.2.6 diff --git a/14.0/Dockerfile b/14.0/Dockerfile index f96d5d0b..9061fe81 100644 --- a/14.0/Dockerfile +++ b/14.0/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9.19-slim-bookworm +FROM python:3.9-slim-bookworm MAINTAINER Camptocamp ARG UID=999 # create the working directory and a place to set the logs (if wanted) diff --git a/14.0/base_requirements.txt b/14.0/base_requirements.txt index 106ad1f5..1b9316bf 100644 --- a/14.0/base_requirements.txt +++ b/14.0/base_requirements.txt @@ -3,58 +3,72 @@ # sys_platform != 'win32' # this is a copy of Odoo dependencies with some bumped versions # unused official dependencies are commented to avoid dependabot alerts -Babel==2.11.0 -chardet==5.0.0 -decorator==5.1.1 -docutils==0.19 -ebaysdk==2.2.0 -freezegun==1.2.2 -gevent==22.10.2 -greenlet==2.0.1 -html2text==2020.1.16 -idna==3.4 -Jinja2==3.1.2 -libsass==0.22.0 -lxml==4.9.1 -lxml-html-clean==0.2.0 -Mako==1.2.4 -MarkupSafe==2.1.1 -num2words==0.5.12 -ofxparse==0.21 -passlib==1.7.4 -Pillow==9.3.0 -polib==1.1.1 -psutil==5.9.4 -psycopg2==2.9.5 -pydot==1.4.2 -python-ldap==3.4.3 -PyPDF2==1.27.12 -pyserial==3.5 -python-dateutil==2.8.2 -pytz==2022.6 -pyusb==1.2.1 -qrcode==7.3.1 -reportlab==3.6.12 -requests==2.28.1 -zeep==4.2.1 -python-stdnum==1.18 +Babel==2.6.0 +chardet==3.0.4 +decorator==4.3.0 +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==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 +# bullseye version, focal patched 2.10 +Jinja2==2.11.3; python_version >= '3.8' # official 2.11.2 +libsass==0.17.0 +# lxml==3.7.1 ; sys_platform != 'win32' and python_version < '3.7' +lxml_html_clean +lxml==4.8.0 +# lxml ; sys_platform == 'win32' +Mako==1.0.7 +MarkupSafe==1.1.0 +num2words==0.5.6 +ofxparse==0.19 +passlib==1.7.1 +# Pillow==6.1.0 ; python_version <= '3.7' and sys_platform == 'win32' +Pillow==8.3.2 ; python_version > '3.7' # official 8.1.1 +polib==1.1.0 +psutil==5.6.6 +psycopg2==2.8.6; sys_platform == 'win32' or python_version >= '3.8' # official 2.8.5 +pydot==1.4.1 +python-ldap==3.1.0; sys_platform != 'win32' +PyPDF2==1.26.0 +pyserial==3.4 +python-dateutil==2.7.3 +pytz==2024.1 +pyusb==1.0.2 +qrcode==6.1 +reportlab==3.6.9 +requests==2.25.1 # official 2.21.0 +zeep==3.2.0 +python-stdnum==1.13 # official 1.8 vobject==0.9.6.1 Werkzeug==0.16.1 -XlsxWriter==3.0.3 +XlsxWriter==1.1.2 xlwt==1.3.* -xlrd==1.1.0; +xlrd==1.2.0; python_version >= '3.8' +# pypiwin32 ; sys_platform == 'win32' + +# Not part of official requirements, but used by some addons +# colorama==0.3.9 gdata==2.0.18 -html5lib==1.1 +html5lib==1.0.1 odfpy==1.4.1 pyinotify==0.9.6 -simplejson==3.18.0 -urllib3==1.26.11 +simplejson==3.17.0 +urllib3==1.26.7 +# Migration tools marabunta==0.12.0 anthem==0.13.0 +# test / lint +# those libs and their dependencies are unpinned +# to always test with the last version of it flake8 -pytest>=5.4.2 +pytest==7.4.4 pluggy coverage pytest-odoo>=0.4.7 @@ -63,18 +77,18 @@ watchdog # Library dependency argh==0.26.2 -atomicwrites==1.4.1 -attrs==22.1.0 -beautifulsoup4==4.11.1 -future==0.18.2 -mccabe==0.7.0 -more-itertools==9.0.0 -pbr==5.11.0 -pexpect==4.8.0 -ptyprocess==0.7.0 -py==1.11.0 -pycodestyle==2.10.0 -pyflakes==3.0.1 +atomicwrites==1.1.5 +attrs==18.1.0 +beautifulsoup4==4.6.0 +future==0.16.0 +mccabe==0.6.1 +more-itertools==4.2.0 +pathtools==0.1.2 +pbr==4.0.4 +pexpect==4.6.0 +ptyprocess==0.5.2 +py==1.5.3 +pycodestyle==2.5.0 +pyflakes==2.1.1 unicodecsv==0.14.1 -wrapt==1.14.1 -openpyxl==2.6.4 +wrapt==1.10.11 diff --git a/14.0/extra_requirements.txt b/14.0/extra_requirements.txt index d5a4c1de..ae5d56a3 100644 --- a/14.0/extra_requirements.txt +++ b/14.0/extra_requirements.txt @@ -1,46 +1,45 @@ # Extra python dependencies -algoliasearch==2.6.2 -Adyen==7.1.1 -cachetools==5.2.0 -cerberus==1.3.4 -boto3==1.26.17 -factur-x==2.3 -invoice2data==0.3.6 -magento==3.1 -mailjet-rest==1.3.4 -openupgradelib==3.4.0 -paramiko==2.12.0 +algoliasearch==1.17.0 +Adyen==1.2.0 +cachetools==2.1.0 +cerberus==1.2 +boto3==1.7.40 +factur-x==0.3 +invoice2data==0.2.74 +magento==3.0 +mailjet-rest==1.3.0 +openupgradelib==1.3.2 +paramiko==2.4.2 parse-accept-language==0.1.2 paypalrestsdk==1.13.1 -phonenumbers==8.13.1 -pyquerystring==1.1 -pyOpenSSL==22.1.0 -pyquerystring==1.1 +phonenumbers==8.9.8 +pyquerystring==1.0.2 +pyOpenSSL==18.0.0 +pyquerystring==1.0.2 pysimplesoap==1.16.2 -requests-mock==1.10.0 +requests-mock==1.5.0 slugify==0.0.1 -stripe==5.0.0 -unidecode==1.3.6 -vcrpy==4.2.1 +stripe==1.82.2 +unidecode==1.0.22 +vcrpy==1.12.0 # Library dependency -asn1crypto==1.5.1 -bcrypt==4.0.1 -botocore==1.29.17 -cffi==1.15.1 -cryptography==38.0.4 -dateparser==1.1.4 -idna==3.4 -jmespath==1.0.1 -multidict==6.0.2 -pdfminer.six==20221105 -pyasn1==0.4.8 -pycparser==2.21 -pycryptodome==3.16.0 -PyNaCl==1.5.0 -pytesseract==0.3.10 -regex==2022.10.31 -s3transfer==0.6.0 -tzlocal==4.2 -Unidecode==1.3.6 -yarl==1.8.1 +asn1crypto==0.24.0 +bcrypt==3.1.4 +botocore==1.10.40 +cffi==1.11.5 +dateparser==0.7.0 +idna==2.7 +jmespath==0.9.3 +multidict==4.3.1 +pdfminer.six==20170720 +pyasn1==0.4.3 +pycparser==2.18 +pycryptodome==3.6.6 +PyNaCl==1.2.1 +pytesseract==0.2.2 +regex==2018.6.9 +s3transfer==0.1.13 +tzlocal==1.5.1 +Unidecode==1.0.22 +yarl==1.2.6 diff --git a/15.0/Dockerfile b/15.0/Dockerfile index eb8e76d0..2b1ebde4 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.4-slim-bookworm +FROM python:3.12-slim-bookworm MAINTAINER Camptocamp ARG UID=999 # create the working directory and a place to set the logs (if wanted) diff --git a/15.0/base_requirements.txt b/15.0/base_requirements.txt index 4d1febbd..e5a4a9eb 100644 --- a/15.0/base_requirements.txt +++ b/15.0/base_requirements.txt @@ -1,47 +1,44 @@ -# 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==5.3.0 -lxml-html-clean==0.2.0 -Mako==1.3.5 -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 -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 -xlwt==1.3.* -xlrd==2.0.1 -pyOpenSSL==24.2.1 - -setuptools==73.0.1 +Babel==2.9.1 # min version = 2.6.0 (Focal with security backports) +chardet==3.0.4 +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.8 +Jinja2==3.1.2 ; python_version >= '3.12' # (Noble) compatibility with markupsafe +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.6 +ofxparse==0.21; python_version > '3.9' # (Jammy) +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.1 +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.12' # (Noble) Compatibility with cryptography +pyserial==3.4 +python-dateutil==2.7.3 +python-ldap==3.4.4 ; sys_platform != 'win32' and python_version >= '3.12' # (Noble) Mostly to have a wheel package +python-stdnum==1.13 +pytz # no version pinning to avoid OS perturbations +pyusb==1.2.1 ; python_version >= '3.12' # (Noble) Mostly to have a wheel package +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 +zeep==3.4.0 # Not part of official requirements, but used by some addons @@ -51,7 +48,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 @@ -60,8 +56,9 @@ marabunta==0.12.0 # test / lint # those libs and their dependencies are unpinned # to always test with the last version of it + flake8 -pytest>=5.4.2 +pytest==8.3.2 pluggy coverage pytest-odoo>=0.4.7 @@ -75,8 +72,8 @@ 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 +pbr==6.1.0 pexpect==4.9.0 ptyprocess==0.7.0 py==1.11.0 @@ -84,4 +81,3 @@ pycodestyle==2.12.1 pyflakes==3.2.0 unicodecsv==0.14.1 wrapt==1.16.0 -openpyxl==3.1.5 diff --git a/15.0/extra_requirements.txt b/15.0/extra_requirements.txt index ff0c777e..e753fc32 100644 --- a/15.0/extra_requirements.txt +++ b/15.0/extra_requirements.txt @@ -3,7 +3,7 @@ algoliasearch==4.1.1 Adyen==12.3.0 cachetools==5.5.0 cerberus==1.3.5 -boto3==1.35.5 +boto3==1.35.6 factur-x==3.1 invoice2data==0.4.5 mailjet-rest==1.3.4 @@ -25,9 +25,8 @@ vcrpy==6.0.1 # Library dependency asn1crypto==1.5.1 bcrypt==4.2.0 -botocore==1.35.5 +botocore==1.35.6 cffi==1.17.0 -cryptography==43.0.0 dateparser==1.2.0 idna==3.8 jmespath==1.0.1 diff --git a/16.0/Dockerfile b/16.0/Dockerfile index c9bf0161..c47d3878 100644 --- a/16.0/Dockerfile +++ b/16.0/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.4-slim-bookworm +FROM python:3.12-slim-bookworm MAINTAINER Camptocamp ARG UID=999 # create the working directory and a place to set the logs (if wanted) diff --git a/16.0/base_requirements.txt b/16.0/base_requirements.txt index dd7077ce..d584bceb 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==5.3.0 -lxml-html-clean==0.2.0 -Mako==1.3.5 -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 @@ -60,7 +61,7 @@ marabunta==0.12.0 # those libs and their dependencies are unpinned # to always test with the last version of it flake8 -pytest>=5.4.2 +pytest==8.3.2 pluggy coverage pytest-odoo>=0.4.7 @@ -74,8 +75,8 @@ 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 +pbr==6.1.0 pexpect==4.9.0 ptyprocess==0.7.0 py==1.11.0 @@ -83,4 +84,3 @@ pycodestyle==2.12.1 pyflakes==3.2.0 unicodecsv==0.14.1 wrapt==1.16.0 -openpyxl==3.1.5 diff --git a/16.0/extra_requirements.txt b/16.0/extra_requirements.txt index ff0c777e..e753fc32 100644 --- a/16.0/extra_requirements.txt +++ b/16.0/extra_requirements.txt @@ -3,7 +3,7 @@ algoliasearch==4.1.1 Adyen==12.3.0 cachetools==5.5.0 cerberus==1.3.5 -boto3==1.35.5 +boto3==1.35.6 factur-x==3.1 invoice2data==0.4.5 mailjet-rest==1.3.4 @@ -25,9 +25,8 @@ vcrpy==6.0.1 # Library dependency asn1crypto==1.5.1 bcrypt==4.2.0 -botocore==1.35.5 +botocore==1.35.6 cffi==1.17.0 -cryptography==43.0.0 dateparser==1.2.0 idna==3.8 jmespath==1.0.1 diff --git a/17.0/Dockerfile b/17.0/Dockerfile index 31788a99..c0b2d7aa 100644 --- a/17.0/Dockerfile +++ b/17.0/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.4-slim-bookworm +FROM python:3.12-slim-bookworm MAINTAINER Camptocamp ARG UID=999 # create the working directory and a place to set the logs (if wanted) diff --git a/17.0/base_requirements.txt b/17.0/base_requirements.txt index ef84a788..1855f5ad 100644 --- a/17.0/base_requirements.txt +++ b/17.0/base_requirements.txt @@ -1,46 +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==5.3.0 -lxml-html-clean==0.2.0 -Mako==1.3.5 -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 -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 @@ -50,7 +51,7 @@ 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 @@ -60,7 +61,7 @@ marabunta==0.12.0 # those libs and their dependencies are unpinned # to always test with the last version of it flake8 -pytest>=5.4.2 +pytest==8.3.2 pluggy coverage pytest-odoo>=0.4.7 @@ -83,4 +84,3 @@ pycodestyle==2.12.1 pyflakes==3.2.0 unicodecsv==0.14.1 wrapt==1.16.0 -openpyxl==3.1.5 diff --git a/17.0/extra_requirements.txt b/17.0/extra_requirements.txt index ff0c777e..619600eb 100644 --- a/17.0/extra_requirements.txt +++ b/17.0/extra_requirements.txt @@ -3,7 +3,7 @@ algoliasearch==4.1.1 Adyen==12.3.0 cachetools==5.5.0 cerberus==1.3.5 -boto3==1.35.5 +boto3==1.35.6 factur-x==3.1 invoice2data==0.4.5 mailjet-rest==1.3.4 @@ -25,7 +25,7 @@ vcrpy==6.0.1 # Library dependency asn1crypto==1.5.1 bcrypt==4.2.0 -botocore==1.35.5 +botocore==1.35.6 cffi==1.17.0 cryptography==43.0.0 dateparser==1.2.0