From: Kiefer Chang Date: Wed, 9 Dec 2020 07:55:24 +0000 (+0800) Subject: mgr/dashboard: remove pyOpenSSL version pinning X-Git-Tag: v14.2.17~105^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9e08fa770999bb8694a27dee7ba9a5a36b06881;p=ceph.git mgr/dashboard: remove pyOpenSSL version pinning Tests require a newer version of pyOpenSSL. Fixes: https://tracker.ceph.com/issues/48506 Signed-off-by: Kiefer Chang (cherry picked from commit 2695075c4b2fc69735a834c49f6f8e768de4f85c) Conflicts: src/pybind/mgr/dashboard/requirements.txt - This manual change was required in order to get the backport working in nautilus --- diff --git a/src/pybind/mgr/dashboard/constraints.txt b/src/pybind/mgr/dashboard/constraints.txt index 5255f89a6c3f8..67b37078fc982 100644 --- a/src/pybind/mgr/dashboard/constraints.txt +++ b/src/pybind/mgr/dashboard/constraints.txt @@ -2,7 +2,6 @@ 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 diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt index 0c01c5f9ede14..3d63ef33d30d6 100644 --- a/src/pybind/mgr/dashboard/requirements.txt +++ b/src/pybind/mgr/dashboard/requirements.txt @@ -19,7 +19,7 @@ py==1.5.2 pycodestyle==2.4.0 pycparser==2.18 PyJWT==1.6.4 -pyopenssl==17.5.0 +pyopenssl pytest==3.3.2 pytest-cov==2.5.1 pytest-faulthandler==1.0.1