aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-05-26 21:38:27 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-05-26 21:38:27 +0200
commit3a6b9c3c5f98bbd363434ab57e32039d2dd9380f (patch)
tree59fd410df1eae2bb953bf23d0b2520cdff1e76b3
parent7efab04efadeb8ea16f6093673aa32863c531c80 (diff)
Remove six from Openstack requirements
Attempting uninstall: six Found existing installation: six 1.15.0 [91mERROR: Cannot uninstall 'six'. It is a distutils installed project and thus we cannot accurately determine which files belong to it which would lead to only a partial uninstall. https://github.com/openstack/requirements/blob/master/upper-constraints.txt#L445 Change-Id: Id31393e9df11920ebebb13cfc4d9080c49a85e52 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/core/Dockerfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 05929fdff..094b626f7 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -23,6 +23,7 @@ RUN apk -U upgrade && \
git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \
git checkout FETCH_HEAD) && \
sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \
+ sed -i -E /^six=/d /src/requirements/upper-constraints.txt && \
case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && apk add --no-cache py3-pynacl ;; esac && \
sed -i -E /#egg=functest/d /src/functest/upper-constraints.txt && \
pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \