Merge pull request #691 from Tecnativa/fix-upgrade-cbor2

[FIX] Workarround pkg_resources removal in setuptools

Author: josep-tecnativa

16.0.Dockerfile

@@ -145,7 +145,8 @@ RUN build_deps=" \
     # disable gevent version recommendation from odoo and use 22.10.2 used in debian bookworm as python3-gevent
     && sed -i -E "s/(gevent==)21\.8\.0( ; sys_platform != 'win32' and python_version > '3.9' and python_version <= '3.10')/\122.10.2\2/;s/(greenlet==)1.1.2( ; sys_platform != 'win32' and python_version  > '3.9' and python_version <= '3.10')/\12.0.2\2/" requirements.txt \
     # need to upgrade setuptools, since the fixes for CVE-2024-6345 rolled out in base images we get errors "error: invalid command 'bdist_wheel'"
-    && pip install --upgrade setuptools \
+    # We need setuptools lower than 82 as odoo uses pkg_resources and it was removed in 82.0.0
+    && pip install --upgrade "setuptools<82" \
     && pip install -r requirements.txt \
         'websocket-client~=0.56' \
         astor \

17.0.Dockerfile

@@ -144,7 +144,8 @@ RUN build_deps=" \
     # disable gevent version recommendation from odoo and use 22.10.2 used in debian bookworm as python3-gevent
     && sed -i -E "s/(gevent==)21\.8\.0( ; sys_platform != 'win32' and python_version == '3.10')/\122.10.2\2/;s/(greenlet==)1.1.2( ; sys_platform != 'win32' and python_version == '3.10')/\12.0.2\2/" requirements.txt \
     # need to upgrade setuptools, since the fixes for CVE-2024-6345 rolled out in base images we get errors "error: invalid command 'bdist_wheel'"
-    && pip install --upgrade setuptools \
+    # We need setuptools lower than 82 as odoo uses pkg_resources and it was removed in 82.0.0
+    && pip install --upgrade "setuptools<82" \
     && pip install -r requirements.txt \
         'websocket-client~=0.56' \
         astor \

18.0.Dockerfile

@@ -143,6 +143,8 @@ RUN build_deps=" \
     && curl -o requirements.txt https://raw.githubusercontent.com/$ODOO_SOURCE/$ODOO_VERSION/requirements.txt \
     # disable gevent version recommendation from odoo and use 22.10.2 used in debian bookworm as python3-gevent
     && sed -i -E "s/(gevent==)21\.8\.0( ; sys_platform != 'win32' and python_version == '3.10')/\122.10.2\2/;s/(greenlet==)1.1.2( ; sys_platform != 'win32' and python_version == '3.10')/\12.0.2\2/" requirements.txt \
+    # cbor2==5.4.2 no longer builds as pkg_resources is removed, and 5.4.6 is already pre-built
+    && sed -i -E "s/(cbor2==)5\.4\.2( ; python_version < '3.12')/\15.4.6\2/" requirements.txt \
     # need to upgrade setuptools, since the fixes for CVE-2024-6345 rolled out in base images we get errors "error: invalid command 'bdist_wheel'"
     && pip install --upgrade setuptools \
     && pip install -r requirements.txt \

19.0.Dockerfile

@@ -143,6 +143,8 @@ RUN build_deps=" \
     && apt-get update \
     && apt-get install -yqq --no-install-recommends $build_deps \
     && curl -o requirements.txt https://raw.githubusercontent.com/$ODOO_SOURCE/$ODOO_VERSION/requirements.txt \
+    # cbor2==5.4.2 no longer builds as pkg_resources is removed, and 5.4.6 is already pre-built
+    && sed -i -E "s/(cbor2==)5\.4\.2( ; python_version < '3.12')/\15.4.6\2/" requirements.txt \
     # need to upgrade setuptools, since the fixes for CVE-2024-6345 rolled out in base images we get errors "error: invalid command 'bdist_wheel'"
     && pip install --upgrade setuptools \
     && pip install -r requirements.txt \