From 2289ad2bc327b0d86916a1c96f4af2967a80c1b9 Mon Sep 17 00:00:00 2001 From: Ernesto Puerta Date: Fri, 25 Mar 2022 16:26:48 +0100 Subject: [PATCH] mgr/dashboard: fix api test issue with pip Fix ``` ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts. apache-libcloud 3.5.0 requires requests>=2.26.0, but you have requests 2.25.1 which is incompatible. Successfully installed CherryPy-13.1.0 PyJWT-2.0.1 Routes-2.4.1 bcrypt-3.1.4 ceph-1.0.0 chardet-4.0.0 cheroot-8.6.0 idna-2.10 jaraco.functools-3.5.0 more-itertools-4.1.0 natsort-8.1.0 portend-3.1.0 pyopenssl-22.0.0 pytz-2022.1 repoze.lru-0.7 requests-2.25.1 tempora-5.0.1 ``` Fixes: https://tracker.ceph.com/issues/55060 Signed-off-by: Ernesto Puerta --- src/pybind/mgr/dashboard/constraints.txt | 2 +- src/pybind/mgr/dashboard/run-backend-api-tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/dashboard/constraints.txt b/src/pybind/mgr/dashboard/constraints.txt index bd5ec4a0a729a..75af032326c09 100644 --- a/src/pybind/mgr/dashboard/constraints.txt +++ b/src/pybind/mgr/dashboard/constraints.txt @@ -3,5 +3,5 @@ more-itertools==4.1.0 PyJWT==2.0.1 bcrypt==3.1.4 python3-saml==1.4.1 -requests==2.25.1 +requests==2.26 Routes==2.4.1 diff --git a/src/pybind/mgr/dashboard/run-backend-api-tests.sh b/src/pybind/mgr/dashboard/run-backend-api-tests.sh index 0bc66d60a545a..bd2f677e0f0fb 100755 --- a/src/pybind/mgr/dashboard/run-backend-api-tests.sh +++ b/src/pybind/mgr/dashboard/run-backend-api-tests.sh @@ -44,7 +44,7 @@ setup_teuthology() { ${TEUTHOLOGY_PYTHON_BIN:-/usr/bin/python3} -m venv venv source venv/bin/activate pip install -U pip 'setuptools>=12,<60' - pip install git+https://github.com/ceph/teuthology#egg=teuthology[test] + pip install "git+https://github.com/ceph/teuthology@7039075#egg=teuthology[test]" pushd $CURR_DIR pip install -r requirements.txt -c constraints.txt popd -- 2.39.5