From 7bcd072081f392b42d3ed676a4c1b7195fe204db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Tue, 2 Jul 2024 14:27:16 +0200 Subject: [PATCH] Use latest versions of python libraries for testing --- Dockerfile | 22 +++++++--------------- requirements-11.0.txt | 5 +++++ requirements-12.0.txt | 5 +++++ requirements-13.0.txt | 5 +++++ requirements-14.0.txt | 5 +++++ requirements-15.0.txt | 16 ++++++++++++++++ requirements-16.0.txt | 16 ++++++++++++++++ requirements-17.0.txt | 16 ++++++++++++++++ 8 files changed, 75 insertions(+), 15 deletions(-) create mode 100644 requirements-11.0.txt create mode 100644 requirements-12.0.txt create mode 100644 requirements-13.0.txt create mode 100644 requirements-14.0.txt create mode 100644 requirements-15.0.txt create mode 100644 requirements-16.0.txt create mode 100644 requirements-17.0.txt diff --git a/Dockerfile b/Dockerfile index 9bfa0ad..e6d1dc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,23 +105,15 @@ ENV PATH=/opt/odoo-venv/bin:$PATH 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 - -# Install other test requirements. -# - coverage -# - websocket-client is required for Odoo browser tests -RUN pip install --no-cache-dir \ - coverage \ - websocket-client - -# Install Odoo (use ADD for correct layer caching) +# Use ADD to rebuild from here when Odoo HEAD changes ARG odoo_org_repo=odoo/odoo ADD https://api.github.com/repos/$odoo_org_repo/git/refs/heads/$odoo_version /tmp/odoo-version.json + +# Install Odoo requirements. +COPY requirements-${odoo_version}.txt /tmp/requirements.txt +RUN pip install --no-cache-dir --no-binary psycopg2 -r /tmp/requirements.txt + +# Install Odoo (use ADD for correct layer caching) RUN mkdir /tmp/getodoo \ && (curl -sSL https://github.com/$odoo_org_repo/tarball/$odoo_version | tar -C /tmp/getodoo -xz) \ && mv /tmp/getodoo/* /opt/odoo \ diff --git a/requirements-11.0.txt b/requirements-11.0.txt new file mode 100644 index 0000000..c857159 --- /dev/null +++ b/requirements-11.0.txt @@ -0,0 +1,5 @@ +https://raw.githubusercontent.com/OCA/OCB/11.0/requirements.txt + +# other test requirements +coverage +websocket-client diff --git a/requirements-12.0.txt b/requirements-12.0.txt new file mode 100644 index 0000000..03e65e3 --- /dev/null +++ b/requirements-12.0.txt @@ -0,0 +1,5 @@ +https://raw.githubusercontent.com/OCA/OCB/12.0/requirements.txt + +# other test requirements +coverage +websocket-client diff --git a/requirements-13.0.txt b/requirements-13.0.txt new file mode 100644 index 0000000..34c9294 --- /dev/null +++ b/requirements-13.0.txt @@ -0,0 +1,5 @@ +https://raw.githubusercontent.com/OCA/OCB/13.0/requirements.txt + +# other test requirements +coverage +websocket-client diff --git a/requirements-14.0.txt b/requirements-14.0.txt new file mode 100644 index 0000000..38555b8 --- /dev/null +++ b/requirements-14.0.txt @@ -0,0 +1,5 @@ +https://raw.githubusercontent.com/OCA/OCB/14.0/requirements.txt + +# other test requirements +coverage +websocket-client diff --git a/requirements-15.0.txt b/requirements-15.0.txt new file mode 100644 index 0000000..5effcf5 --- /dev/null +++ b/requirements-15.0.txt @@ -0,0 +1,16 @@ +# Add requirements and bounds that are missing from setup.py. +freezegun +lxml-html-clean +num2words +pdfminer +pypdf2<3 +rl-renderPM # reportlab accelerator +xlrd<2 # xlrd 2 dropped xlsx reading capability + +# We use no-binary for psycopg2 because its binary wheels are sometimes broken +# and not very portable. +--no-binary psycopg2 + +# other test requirements +coverage +websocket-client diff --git a/requirements-16.0.txt b/requirements-16.0.txt new file mode 100644 index 0000000..5effcf5 --- /dev/null +++ b/requirements-16.0.txt @@ -0,0 +1,16 @@ +# Add requirements and bounds that are missing from setup.py. +freezegun +lxml-html-clean +num2words +pdfminer +pypdf2<3 +rl-renderPM # reportlab accelerator +xlrd<2 # xlrd 2 dropped xlsx reading capability + +# We use no-binary for psycopg2 because its binary wheels are sometimes broken +# and not very portable. +--no-binary psycopg2 + +# other test requirements +coverage +websocket-client diff --git a/requirements-17.0.txt b/requirements-17.0.txt new file mode 100644 index 0000000..5effcf5 --- /dev/null +++ b/requirements-17.0.txt @@ -0,0 +1,16 @@ +# Add requirements and bounds that are missing from setup.py. +freezegun +lxml-html-clean +num2words +pdfminer +pypdf2<3 +rl-renderPM # reportlab accelerator +xlrd<2 # xlrd 2 dropped xlsx reading capability + +# We use no-binary for psycopg2 because its binary wheels are sometimes broken +# and not very portable. +--no-binary psycopg2 + +# other test requirements +coverage +websocket-client