Skip to content

Commit

Permalink
[IMP] 16,17,18: use gevent 22.10.2
Browse files Browse the repository at this point in the history
pip install gevent==21.8.0 fails with exception when installing with pip in
ubuntu/debian. gevent 22.10.2 then also requires greenlet 2.0.2
  • Loading branch information
ap-wtioit committed Nov 11, 2024
1 parent 0c5b619 commit 1208bd9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
8 changes: 2 additions & 6 deletions 16.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,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 \
&& \
if [ "$TARGETARCH" = "arm64" ]; then \
echo "Upgrading odoo requirements.txt with gevent==21.12.0 and greenlet==1.1.0 (minimum version compatible with arm64)" && \
sed -i 's/gevent==[0-9\.]*/gevent==21.12.0/' requirements.txt && \
sed -i 's/greenlet==[0-9\.]*/greenlet==1.1.0/' requirements.txt; \
fi \
# 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 \
&& pip install -r requirements.txt \
'websocket-client~=0.56' \
astor \
Expand Down
7 changes: 2 additions & 5 deletions 17.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,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 \
&& \
if [ "$TARGETARCH" = "arm64" ]; then \
echo "Upgrading odoo requirements.txt with gevent==21.12.0 (minimum version compatible with arm64)" && \
sed -i 's/gevent==[0-9\.]*/gevent==21.12.0/' requirements.txt; \
fi \
# 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 \
&& pip install -r requirements.txt \
'websocket-client~=0.56' \
astor \
Expand Down
7 changes: 2 additions & 5 deletions 18.0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,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 \
&& \
if [ "$TARGETARCH" = "arm64" ]; then \
echo "Upgrading odoo requirements.txt with gevent==21.12.0 (minimum version compatible with arm64)" && \
sed -i 's/gevent==[0-9\.]*/gevent==21.12.0/' requirements.txt; \
fi \
# 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 \
&& pip install -r requirements.txt \
'websocket-client~=0.56' \
astor \
Expand Down

0 comments on commit 1208bd9

Please sign in to comment.