From 9f9de7acf0419839f9508678933551e6912f8826 Mon Sep 17 00:00:00 2001
From: remi-filament <30716308+remi-filament@users.noreply.github.com>
Date: Tue, 1 Sep 2020 18:10:18 +0200
Subject: [PATCH] Revert setuptools version to the Debian one because of issue
with distutils deprecation in latest releases
https://setuptools.readthedocs.io/en/latest/distutils-legacy.html
---
10.0.Dockerfile | 2 +-
12.0.Dockerfile | 2 +-
12.0_ml.Dockerfile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/10.0.Dockerfile b/10.0.Dockerfile
index 938b401..7998c24 100644
--- a/10.0.Dockerfile
+++ b/10.0.Dockerfile
@@ -46,7 +46,7 @@ RUN set -x; \
apt-get install -y --no-install-recommends ${APT_DEPS} &&\
curl https://bootstrap.pypa.io/get-pip.py | python /dev/stdin &&\
pip install -I -r https://raw.githubusercontent.com/OCA/OCB/10.0/requirements.txt &&\
- pip install simplejson WTForms Werkzeug==0.14.1 &&\
+ pip install simplejson WTForms Werkzeug==0.14.1 setuptools==5.5.1 &&\
apt-get -y purge ${APT_DEPS} &&\
apt-get -y autoremove &&\
rm -rf /var/lib/apt/lists/* wkhtmltox.deb
diff --git a/12.0.Dockerfile b/12.0.Dockerfile
index c6e81dc..c5fb60d 100644
--- a/12.0.Dockerfile
+++ b/12.0.Dockerfile
@@ -41,7 +41,7 @@ RUN set -x; \
apt-get install -y --no-install-recommends ${APT_DEPS} &&\
curl https://bootstrap.pypa.io/get-pip.py | python3 /dev/stdin &&\
pip install -I -r https://raw.githubusercontent.com/OCA/OCB/12.0/requirements.txt &&\
- pip install simplejson WTForms zxcvbn phonenumbers Werkzeug==0.14.1 &&\
+ pip install simplejson WTForms zxcvbn phonenumbers Werkzeug==0.14.1 setuptools==33.1.1 &&\
apt-get -y purge ${APT_DEPS} &&\
apt-get -y autoremove &&\
rm -rf /var/lib/apt/lists/* wkhtmltox.deb
diff --git a/12.0_ml.Dockerfile b/12.0_ml.Dockerfile
index cc629ff..ccb0a59 100644
--- a/12.0_ml.Dockerfile
+++ b/12.0_ml.Dockerfile
@@ -41,7 +41,7 @@ RUN set -x; \
apt-get install -y --no-install-recommends ${APT_DEPS} &&\
curl https://bootstrap.pypa.io/get-pip.py | python3 /dev/stdin &&\
pip install -I -r https://raw.githubusercontent.com/OCA/OCB/12.0/requirements.txt &&\
- pip install simplejson WTForms zxcvbn phonenumbers Werkzeug==0.14.1 &&\
+ pip install simplejson WTForms zxcvbn phonenumbers Werkzeug==0.14.1 setuptools==33.1.1 &&\
apt-get -y purge ${APT_DEPS} &&\
apt-get -y autoremove &&\
rm -rf /var/lib/apt/lists/* wkhtmltox.deb
--
GitLab