From a2c0f6555514276c22c1d3cb2b4f1f83a2425426 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 19 Apr 2021 20:16:32 +0200 Subject: Apply --use-deprecated in all pip calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If51e2f5c32b53b6a1124a7d3d1ccad4e8446ec88 Signed-off-by: Cédric Ollivier --- docker/benchmarking/Dockerfile | 4 ++-- docker/healthcheck/Dockerfile | 2 +- docker/smoke/Dockerfile | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 94669a709..c2b24d596 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -8,14 +8,14 @@ RUN apk --no-cache add --update libxml2 libxslt && \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \ - pip3 install --no-cache-dir -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt lxml ;; esac && \ git init /src/vmtp && \ (cd /src/vmtp && \ git fetch --tags https://review.opendev.org/x/vmtp.git $VMTP_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/requirements /src/vmtp/ && \ - pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt \ /src/vmtp && \ mkdir -p /home/opnfv/functest/data/rally/neutron/rally-jobs && \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 6bd74f001..b95748401 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -11,7 +11,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ git fetch --tags https://opendev.org/openstack/tempest-horizon.git $TEMPEST_HORIZON_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/requirements /src/tempest-horizon/ && \ - pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt \ /src/tempest-horizon -rthirdparty-requirements.txt && \ git init /src/odl_test && \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index c8d0cca75..67ff23fdd 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -20,7 +20,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \ - pip3 install --no-cache-dir -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt lxml && \ sed -i -E /^numpy=/d /src/requirements/upper-constraints.txt && apk add py3-numpy ;; esac && \ git init /src/patrole && \ @@ -68,14 +68,14 @@ RUN apk --no-cache add --update libxml2 libxslt && \ git fetch --tags https://opendev.org/openstack/cyborg-tempest-plugin.git $CYBORG_TEMPEST_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/requirements /src/cyborg-tempest-plugin && \ - pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt \ /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ /src/cinder-tempest-plugin /src/keystone-tempest-plugin \ /src/octavia-tempest-plugin /src/heat-tempest-plugin /src/telemetry-tempest-plugin \ /src/cyborg-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ - pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt \ git+https://opendev.org/openstack/neutron.git@$NEUTRON_TAG#egg=neutron \ git+https://opendev.org/openstack/glance.git@$GLANCE_TAG#egg=glance \ -- cgit 1.2.3-korg