mgr/dashboard: require enum34 only for python_version<'3.4'

This is a partial backport of 1e07237d92da3bb5eba82b49f6276d17696e6985

Backporting the entire thing would be too intrusive.

Fixes: https://tracker.ceph.com/issues/45636
Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/src/pybind/mgr/dashboard/constraints.txt b/src/pybind/mgr/dashboard/constraints.txt
new file mode 100644 (file)
index 0000000..5255f89
--- /dev/null
+++ b/src/pybind/mgr/dashboard/constraints.txt
@@ -0,0 +1,10 @@
+CherryPy==13.1.0
+enum34==1.1.6
+more-itertools==4.1.0
+PyJWT==1.6.4
+pyopenssl==17.5.0
+bcrypt==3.1.4
+python3-saml==1.4.1
+requests==2.20.0
+Routes==2.4.1
+six==1.14.0

diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt
index 3d6a751a2b9f15860708ed7fd5bc2eb99bb1ff6c..0c01c5f9ede1417384b3c5cd3150c1d8645a95c2 100644 (file)
--- a/src/pybind/mgr/dashboard/requirements.txt
+++ b/src/pybind/mgr/dashboard/requirements.txt
@@ -5,7 +5,7 @@ cheroot==6.0.0
 CherryPy==13.1.0
 configparser==3.5.0
 coverage==4.5.2
-enum34==1.1.6
+enum34; python_version<'3.4'
 funcsigs==1.0.2
 isort==4.2.15
 lazy-object-proxy==1.3.1