Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMP] 16,17,18: use gevent 22.10.2 #636

Merged
merged 1 commit into from
Nov 11, 2024
Merged

[IMP] 16,17,18: use gevent 22.10.2 #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions 16.0.Dockerfile
View file
Open in desktop
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.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 \
&& pip install -r requirements.txt \
'websocket-client~=0.56' \
astor \
Expand Down
7 changes: 2 additions & 5 deletions 17.0.Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
Loading