fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup!…

… fixup! fixup! fixup! fix: new flovar

15.0/base_requirements.txt

@@ -2,6 +2,7 @@
 # colorama==0.3.9
 gdata==2.0.18
 lxml-html-clean==0.4.1
+whool==1.2
 
 
 # Migration tools

16.0/Dockerfile

@@ -30,7 +30,8 @@ ENV BUILD_PACKAGE \
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
 # wkhtml-buster is kept as in official image, no deb available for bullseye
 RUN set -x; \
-        sh -c /install/package_odoo.sh \
+        sh -c /install/package_odoo_common.sh \
+        && /install/package_odoo.sh \
         && /install/setup-pip.sh \
         && /install/postgres.sh \
         && /install/kwkhtml_client.sh \

16.0/base_requirements.txt

@@ -1,41 +1,11 @@
 # Not part of official requirements, but used by some addons
 # colorama==0.3.9
 gdata==2.0.18
-html5lib==1.1
-odfpy==1.4.1
-pyinotify==0.9.6
-simplejson==3.19.3
 lxml-html-clean==0.4.1
+whool==1.2
 
 
 # Migration tools
 marabunta==0.12.0
 -e git+https://github.com/camptocamp/anthem@master#egg=anthem
 
-# test / lint
-# those libs and their dependencies are unpinned
-# to always test with the last version of it
-flake8
-pytest==8.3.2
-pluggy
-coverage
-pytest-odoo>=0.4.7
-pytest-cov>=2.10.0
-watchdog
-
-# Library dependency
-argh==0.31.3
-atomicwrites==1.4.1
-attrs==24.2.0
-beautifulsoup4==4.12.3
-future==1.0.0
-mccabe==0.7.0
-more-itertools==10.5.0
-pbr==6.1.0
-pexpect==4.9.0
-ptyprocess==0.7.0
-py==1.11.0
-pycodestyle==2.12.1
-pyflakes==3.2.0
-unicodecsv==0.14.1
-wrapt==1.16.0

17.0/Dockerfile

@@ -13,7 +13,19 @@ ENV LANG=C.UTF-8 \
 
 # build and dev packages
 # build and dev packages
-ENV BUILD_PACKAGE=""
+ENV BUILD_PACKAGE \
+    build-essential \
+    gcc \
+    libevent-dev \
+    libfreetype6-dev \
+    libxml2-dev \
+    libxslt1-dev \
+    libsasl2-dev \
+    libldap2-dev \
+    libssl-dev \
+    libjpeg-dev \
+    libpng-dev \
+    zlib1g-dev \
 
 # run in a virtualenv
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf

18.0/Dockerfile

@@ -30,7 +30,8 @@ ENV BUILD_PACKAGE \
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
 # wkhtml-buster is kept as in official image, no deb available for bullseye
 RUN set -x; \
-        sh -c /install/package_odoo.sh \
+        sh -c /install/package_odoo_common.sh \
+        && /install/package_odoo_common_custom.sh \
         && /install/setup-pip.sh \
         && /install/postgres.sh \
         && /install/kwkhtml_client.sh \
@@ -42,7 +43,6 @@ RUN set -x; \
 # grab dockerize to generate template and
 # wait on postgres
 RUN /install/dockerize.sh
-
 COPY ./src_requirements.txt /odoo
 COPY ./bin /odoo/odoo-bin
 COPY ./templates /templates

18.0/base_requirements.txt

@@ -1,41 +1,11 @@
 # Not part of official requirements, but used by some addons
 # colorama==0.3.9
 gdata==2.0.18
-html5lib==1.1
-odfpy==1.4.1
-pyinotify==0.9.6
-simplejson==3.19.3
 lxml-html-clean==0.4.1
+whool==1.2
 
 
 # Migration tools
 marabunta==0.12.0
 -e git+https://github.com/camptocamp/anthem@master#egg=anthem
 
-# test / lint
-# those libs and their dependencies are unpinned
-# to always test with the last version of it
-flake8
-pytest==8.3.2
-pluggy
-coverage
-pytest-odoo>=0.4.7
-pytest-cov>=2.10.0
-watchdog
-
-# Library dependency
-argh==0.31.3
-atomicwrites==1.4.1
-attrs==24.2.0
-beautifulsoup4==4.12.3
-future==1.0.0
-mccabe==0.7.0
-more-itertools==10.4.0
-pbr==6.0.0
-pexpect==4.9.0
-ptyprocess==0.7.0
-py==1.11.0
-pycodestyle==2.12.1
-pyflakes==3.2.0
-unicodecsv==0.14.1
-wrapt==1.16.0

example/Dockerfile

@@ -16,10 +16,6 @@ COPY ./setup.py /odoo/
 COPY ./VERSION /odoo/
 COPY ./migration.yml /odoo/
 USER root
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends parallel  libsasl2-dev libldap2-dev libssl-dev libmagic1 build-essential python3-dev libffi-dev pkg-config libcairo2-dev libgirepository1.0-dev\
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
 
 RUN set -x; \
         apt-get update \