Skip to content

Commit

Permalink
feat: pin packages to odoo version + do not use specific patched vers…
Browse files Browse the repository at this point in the history
…ion of python (#294)

* feat: package fixing rev + fix test on current image + do not ping on specific patched version of python
  • Loading branch information
vrenaville authored Sep 12, 2024
1 parent 2814582 commit 055fd0e
Show file tree
Hide file tree
Showing 19 changed files with 456 additions and 449 deletions.
2 changes: 1 addition & 1 deletion 12.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
118 changes: 63 additions & 55 deletions 12.0/base_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
79 changes: 39 additions & 40 deletions 12.0/extra_requirements.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion 13.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
120 changes: 64 additions & 56 deletions 13.0/base_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Loading

0 comments on commit 055fd0e

Please sign in to comment.