From adf0cad56b5189f361d891b02a3b4c46c1becaf2 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <973709+yajo@users.noreply.github.com>
Date: Thu, 16 Nov 2023 09:00:49 +0000
Subject: [PATCH] fix: remove flanker from py3.10 flavors

After merging https://github.com/Tecnativa/doodba/pull/577, we started getting build failures due to https://github.com/mailgun/flanker/issues/261.

We should better remove that dependency, which is very outdated and not much maintained, and is optional for Odoo.

@moduon MT-3948
---
 16.0.Dockerfile | 4 ----
 17.0.Dockerfile | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/16.0.Dockerfile b/16.0.Dockerfile
index 47deb5ec..351f1365 100644
--- a/16.0.Dockerfile
+++ b/16.0.Dockerfile
@@ -123,7 +123,6 @@ RUN build_deps=" \
         click-odoo-contrib \
         debugpy \
         pydevd-odoo \
-        flanker[validator] \
         geoip2 \
         "git-aggregator<3.0.0" \
         inotify \
@@ -137,9 +136,6 @@ RUN build_deps=" \
         watchdog \
         wdb \
     && (python3 -m compileall -q /usr/local/lib/python3.10/ || true) \
-    # generate flanker cached tables during install when /usr/local/lib/ is still intended to be written to
-    # https://github.com/Tecnativa/doodba/issues/486
-    && python3 -c 'from flanker.addresslib import address' >/dev/null 2>&1 \
     && apt-get purge -yqq $build_deps \
     && apt-get autopurge -yqq \
     && rm -Rf /var/lib/apt/lists/* /tmp/*
diff --git a/17.0.Dockerfile b/17.0.Dockerfile
index 3b244950..9d0629d5 100644
--- a/17.0.Dockerfile
+++ b/17.0.Dockerfile
@@ -123,7 +123,6 @@ RUN build_deps=" \
         click-odoo-contrib \
         debugpy \
         pydevd-odoo \
-        flanker[validator] \
         geoip2 \
         "git-aggregator<3.0.0" \
         inotify \
@@ -137,9 +136,6 @@ RUN build_deps=" \
         watchdog \
         wdb \
     && (python3 -m compileall -q /usr/local/lib/python3.10/ || true) \
-    # generate flanker cached tables during install when /usr/local/lib/ is still intended to be written to
-    # https://github.com/Tecnativa/doodba/issues/486
-    && python3 -c 'from flanker.addresslib import address' >/dev/null 2>&1 \
     && apt-get purge -yqq $build_deps \
     && apt-get autopurge -yqq \
     && rm -Rf /var/lib/apt/lists/* /tmp/*