Skip to content

Commit f09eedf

Browse files
committed
fix: 312
1 parent 0e7dc19 commit f09eedf

File tree

2 files changed

+56
-2
lines changed

2 files changed

+56
-2
lines changed

19.0/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.13-slim-trixie
1+
FROM python:3.12-slim-trixie
22
MAINTAINER Camptocamp
33

44
# create the working directory and a place to set the logs (if wanted)
@@ -75,7 +75,7 @@ ENV ODOO_VERSION=19.0 \
7575
ODOO_DATA_PATH=/odoo/data \
7676
DEMO=False \
7777
ADDONS_PATH=/odoo/local-src,/odoo/src/addons \
78-
OPENERP_SERVER=/etc/odoo.cfg
78+
ODOO_RC=/etc/odoo.cfg
7979

8080
ENTRYPOINT ["docker-entrypoint.sh"]
8181
CMD ["odoo"]

19.0/base_requirements.txt

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,103 @@
22
# python3-* equivalent distributed in Ubuntu 24.04 and Debian 12
33
# The officially supported versions of the following packages are their
44
# python3-* equivalent distributed in Ubuntu 24.04 and Debian 12
5+
# The officially supported versions of the following packages are their
6+
# python3-* equivalent distributed in Ubuntu 24.04 and Debian 12
7+
asn1crypto==1.4.0 ; python_version < '3.11'
58
asn1crypto==1.5.1 ; python_version >= '3.11'
9+
Babel==2.9.1 ; python_version < '3.11' # min version = 2.6.0 (Focal with security backports)
10+
Babel==2.10.3 ; python_version >= '3.11' and python_version < '3.13'
611
Babel==2.17.0 ; python_version >= '3.13'
12+
cbor2==5.4.2 ; python_version < '3.12'
713
cbor2==5.6.2 ; python_version >= '3.12'
14+
chardet==4.0.0 ; python_version < '3.11' # (Jammy)
815
chardet==5.2.0 ; python_version >= '3.11'
16+
cryptography==3.4.8; python_version < '3.12' # incompatibility between pyopenssl 19.0.0 and cryptography>=37.0.0
917
cryptography==42.0.8 ; python_version >= '3.12' # (Noble) min 41.0.7, pinning 42.0.8 for security fixes
18+
docutils==0.17 ; python_version < '3.11' # (Jammy)
1019
docutils==0.20.1 ; python_version >= '3.11'
20+
freezegun==1.1.0 ; python_version < '3.11' # (Jammy)
21+
freezegun==1.2.1 ; python_version >= '3.11' and python_version < '3.13'
1122
freezegun==1.5.1 ; python_version >= '3.13'
1223
geoip2==2.9.0
24+
gevent==21.8.0 ; sys_platform != 'win32' and python_version == '3.10' # (Jammy)
25+
gevent==22.10.2; sys_platform != 'win32' and python_version > '3.10' and python_version < '3.12'
26+
gevent==24.2.1 ; sys_platform != 'win32' and python_version >= '3.12' and python_version < '3.13' # (Noble)
1327
gevent==24.11.1 ; sys_platform != 'win32' and python_version >= '3.13' # (Trixie)
28+
greenlet==1.1.2 ; sys_platform != 'win32' and python_version == '3.10' # (Jammy)
29+
greenlet==2.0.2 ; sys_platform != 'win32' and python_version > '3.10' and python_version < '3.12'
30+
greenlet==3.0.3 ; sys_platform != 'win32' and python_version >= '3.12' and python_version < '3.13' # (Noble)
1431
greenlet==3.1.1 ; sys_platform != 'win32' and python_version >= '3.13' # (Trixie)
32+
idna==2.10 ; python_version < '3.12' # requests 2.25.1 depends on idna<3 and >=2.5
1533
idna==3.6 ; python_version >= '3.12'
34+
Jinja2==3.0.3 ; python_version <= '3.10'
1635
Jinja2==3.1.2 ; python_version > '3.10'
36+
libsass==0.20.1 ; python_version < '3.11'
1737
libsass==0.22.0 ; python_version >= '3.11' # (Noble) Mostly to have a wheel package
38+
lxml==4.8.0 ; python_version <= '3.10'
39+
lxml==4.9.3 ; python_version > '3.10' and python_version < '3.12' # min 4.9.2, pinning 4.9.3 because of missing wheels for darwin in 4.9.3
1840
lxml==5.2.1; python_version >= '3.12' # (Noble - removed html clean)
1941
lxml-html-clean; python_version >= '3.12' # (Noble - removed from lxml, unpinned for futur security patches)
42+
MarkupSafe==2.0.1 ; python_version <= '3.10'
43+
MarkupSafe==2.1.2 ; python_version > '3.10' and python_version < '3.12'
2044
MarkupSafe==2.1.5 ; python_version >= '3.12' # (Noble) Mostly to have a wheel package
45+
num2words==0.5.10 ; python_version < '3.12' # (Jammy / Bookworm)
2146
num2words==0.5.13 ; python_version >= '3.12'
2247
ofxparse==0.21
48+
openpyxl==3.0.9 ; python_version < '3.12'
2349
openpyxl==3.1.2 ; python_version >= '3.12'
2450
passlib==1.7.4 # min version = 1.7.2 (Focal with security backports)
51+
Pillow==9.0.1 ; python_version <= '3.10'
52+
Pillow==9.4.0 ; python_version > '3.10' and python_version < '3.12'
53+
Pillow==10.2.0 ; python_version >= '3.12' and python_version < '3.13' # (Noble) Mostly to have a wheel package
2554
Pillow==11.1.0 ; python_version >= '3.13' # (Noble) Mostly to have a wheel package
2655
polib==1.1.1
56+
psutil==5.9.0 ; python_version <= '3.10'
57+
psutil==5.9.4 ; python_version > '3.10' and python_version < '3.12'
2758
psutil==5.9.8 ; python_version >= '3.12' # (Noble) Mostly to have a wheel package
59+
psycopg2==2.9.2 ; python_version == '3.10' # (Jammy)
60+
psycopg2==2.9.5 ; python_version == '3.11'
61+
psycopg2==2.9.9 ; python_version >= '3.12' and python_version < '3.13' # (Noble)
2862
psycopg2==2.9.10 ; python_version >= '3.13' # (Trixie)
63+
pyopenssl==21.0.0 ; python_version < '3.12'
2964
pyopenssl==24.1.0 ; python_version >= '3.12' # (Noble) min 23.2.0, pinned for compatibility with cryptography==42.0.8 and security patches
65+
PyPDF2==1.26.0 ; python_version <= '3.10'
3066
PyPDF2==2.12.1 ; python_version > '3.10'
67+
pypiwin32 ; sys_platform == 'win32'
3168
pyserial==3.5
69+
python-dateutil==2.8.1 ; python_version < '3.11'
3270
python-dateutil==2.8.2 ; python_version >= '3.11'
71+
python-magic==0.4.24; sys_platform != 'win32' and python_version < '3.12' # (jammy)
3372
python-magic==0.4.27; sys_platform != 'win32' and python_version >= '3.12' # (noble)
73+
python-ldap==3.4.0 ; sys_platform != 'win32' and python_version < '3.12' # min version = 3.2.0 (Focal with security backports)
3474
python-ldap==3.4.4 ; sys_platform != 'win32' and python_version >= '3.12' # (Noble) Mostly to have a wheel package
75+
python-stdnum==1.17 ; python_version < '3.11' # (jammy)
3576
python-stdnum==1.19 ; python_version >= '3.11'
3677
pytz # no version pinning to avoid OS perturbations
3778
pyusb==1.2.1
79+
qrcode==7.3.1 ; python_version < '3.11' # (jammy)
3880
qrcode==7.4.2 ; python_version >= '3.11'
81+
reportlab==3.6.8 ; python_version <= '3.10'
82+
reportlab==3.6.12 ; python_version > '3.10' and python_version < '3.12'
3983
reportlab==4.1.0 ; python_version >= '3.12' # (Noble) Mostly to have a wheel package
84+
requests==2.25.1 ; python_version < '3.11' # versions < 2.25 aren't compatible w/ urllib3 1.26. Bullseye = 2.25.1. min version = 2.22.0 (Focal)
4085
requests==2.31.0 ; python_version >= '3.11' # (Noble)
86+
rjsmin==1.1.0 ; python_version < '3.11' # (jammy)
4187
rjsmin==1.2.0 ; python_version >= '3.11'
88+
rl-renderPM==4.0.3 ; sys_platform == 'win32' and python_version >= '3.12' # Needed by reportlab 4.1.0 but included in deb package
89+
urllib3==1.26.5 ; python_version < '3.12' # indirect / min version = 1.25.8 (Focal with security backports)
4290
urllib3==2.0.7 ; python_version >= '3.12' # (Noble) Compatibility with cryptography
4391
vobject==0.9.6.1
92+
Werkzeug==2.0.2 ; python_version <= '3.10'
93+
Werkzeug==2.2.2 ; python_version > '3.10' and python_version < '3.12'
4494
Werkzeug==3.0.1 ; python_version >= '3.12' # (Noble) Avoid deprecation warnings
95+
xlrd==1.2.0 ; python_version < '3.12' # (jammy)
4596
xlrd==2.0.1 ; python_version >= '3.12'
97+
XlsxWriter==3.0.2 ; python_version < '3.12' # (jammy)
4698
XlsxWriter==3.1.9 ; python_version >= '3.12'
4799
xlwt==1.3.0
100+
zeep==4.1.0 ; python_version < '3.11' # (jammy)
101+
zeep==4.2.1 ; python_version >= '3.11' and python_version < '3.13'
48102
zeep==4.3.1 ; python_version >= '3.13'
49103
zope.event==6.0
50104
zope.interface==8.0

0 commit comments

Comments
 (0)