From: Kefu Chai <kchai@redhat.com>
Date: Tue, 31 Mar 2020 12:08:51 +0000 (+0800)
Subject: pybind/mgr: use six==1.14.0
X-Git-Tag: v14.2.10~160^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49fa8c70d4d58f8118d34266e8da4d245151ed5d;p=ceph.git

pybind/mgr: use six==1.14.0

this change is not cherry-picked from master. because in master, we
are using different ways to install six:

see
- 68527ab83a77d20b779759581ce0b8844991231b
- 1e07237d92da3bb5eba82b49f6276d17696e6985

because in teuthology we are using six.ensure_str, which was added in
six 1.12.0, see https://github.com/benjaminp/six/blob/1.12.0/CHANGES ,
we cannot continue using six 1.11.0, as a result, we need switch over to
six>1.12.0. since the latest stable version of six is now 1.14.0, let's
just use it.

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

diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt
index caa1db80e96f..f097dd8fa13e 100644
--- a/src/pybind/mgr/dashboard/requirements.txt
+++ b/src/pybind/mgr/dashboard/requirements.txt
@@ -27,7 +27,7 @@ pytz==2017.3
 requests==2.20.0
 Routes==2.4.1
 singledispatch==3.4.0.3
-six==1.11.0
+six==1.14.0
 tempora==1.10
 tox==2.9.1
 virtualenv==15.1.0
diff --git a/src/pybind/mgr/dashboard/run-backend-api-tests.sh b/src/pybind/mgr/dashboard/run-backend-api-tests.sh
index 1e11b612e5c4..ccdb1ca61f3b 100755
--- a/src/pybind/mgr/dashboard/run-backend-api-tests.sh
+++ b/src/pybind/mgr/dashboard/run-backend-api-tests.sh
@@ -74,7 +74,7 @@ pyparsing==2.2.0
 python-dateutil==2.6.1
 PyYAML==3.12
 requests==2.18.4
-six==1.10.0
+six==1.14.0
 urllib3==1.22
 "