From fe925723390f23650bdaffc99e9f8f9f5fe63cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sat, 5 Oct 2024 16:56:32 +0200 Subject: [PATCH 1/2] Remove useless --no-binary from Dockerfile There is psycopg2 linux wheel on PyPI anyway. --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7698d3..e41291f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -110,10 +110,9 @@ ARG odoo_version # Install Odoo requirements (use ADD for correct layer caching). # We use requirements from OCB for easier maintenance of older versions. -# We use no-binary for psycopg2 because its binary wheels are sometimes broken -# and not very portable. ADD https://raw.githubusercontent.com/OCA/OCB/$odoo_version/requirements.txt /tmp/ocb-requirements.txt -RUN pip install --no-cache-dir --no-binary psycopg2 -r /tmp/ocb-requirements.txt +RUN pip install --no-cache-dir \ + -r /tmp/ocb-requirements.txt # Install other test requirements. # - coverage From c6fcca6dc1bd9c2fa7d516a295bbb6121b318be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sat, 5 Oct 2024 16:57:04 +0200 Subject: [PATCH 2/2] Add packaging as a dependency --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e41291f..c687950 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,7 +112,8 @@ ARG odoo_version # We use requirements from OCB for easier maintenance of older versions. ADD https://raw.githubusercontent.com/OCA/OCB/$odoo_version/requirements.txt /tmp/ocb-requirements.txt RUN pip install --no-cache-dir \ - -r /tmp/ocb-requirements.txt + -r /tmp/ocb-requirements.txt \ + packaging # Install other test requirements. # - coverage