From: Kefu Chai <kchai@redhat.com>
Date: Wed, 11 Nov 2020 05:09:53 +0000 (+0800)
Subject: pybind/mgr: add urllib3==1.25.11 to mgr/requirements.txt
X-Git-Tag: v16.1.0~639^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F38021%2Fhead;p=ceph.git

pybind/mgr: add urllib3==1.25.11 to mgr/requirements.txt

in hope to address the failure of

ERROR: Cannot install -r requirements.txt (line 3) and kubernetes because these package versions have conflicting dependencies.

The conflict is caused by:
    kubernetes 12.0.0 depends on urllib3>=1.24.2
    requests 2.24.0 depends on urllib3!=1.25.0, !=1.25.1, <1.26 and >=1.21.1

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/requirements.txt b/src/pybind/mgr/requirements.txt
index 7d7cb1fbe383..63840e252f8b 100644
--- a/src/pybind/mgr/requirements.txt
+++ b/src/pybind/mgr/requirements.txt
@@ -9,4 +9,4 @@ execnet
 remoto
 Jinja2
 pyfakefs
-
+urllib3==1.25.11