From: Kefu Chai <kchai@redhat.com>
Date: Mon, 10 Feb 2020 15:30:34 +0000 (+0800)
Subject: pybind/mgr: bump six to 1.14
X-Git-Tag: v15.1.1~487^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33185%2Fhead;p=ceph.git

pybind/mgr: bump six to 1.14

otherwise some packages which uses six.ensure_text will fail, as it
was introduced by 1.12. and 1.14 is the latest stable version of
six. so let's use it instead.

Fixes: https://tracker.ceph.com/issues/44063
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/constraints.txt b/src/pybind/mgr/dashboard/constraints.txt
index dfb1f131bb4..5255f89a6c3 100644
--- a/src/pybind/mgr/dashboard/constraints.txt
+++ b/src/pybind/mgr/dashboard/constraints.txt
@@ -7,4 +7,4 @@ bcrypt==3.1.4
 python3-saml==1.4.1
 requests==2.20.0
 Routes==2.4.1
-six==1.11.0
+six==1.14.0
diff --git a/src/pybind/mgr/dashboard/tox.ini b/src/pybind/mgr/dashboard/tox.ini
index 9632ffd7984..6962d9b4bd7 100644
--- a/src/pybind/mgr/dashboard/tox.ini
+++ b/src/pybind/mgr/dashboard/tox.ini
@@ -138,6 +138,6 @@ commands =
 
 [testenv:check]
 deps = 
-    six==1.11.0
+    six==1.14.0
 commands =
     python ci/check_grafana_uids.py frontend/src/app ../../../../monitoring/grafana/dashboards