Skip to content

Commit

Permalink
repo: mgr/dashboard deps pylint->2.17, cherrypy->18
Browse files Browse the repository at this point in the history
cherrypy is a runtime dependency, while pylint is a build/lint dep, both
of them encountered import errors due to API removals in py3.11, see the
links for more.

pylint's is indirect, a dependency of a dependency:

  pylint->astroid->wrapt

but fixed by moving to a more recent version

- ceph-17.2.6-mgr-dashboard-cherrypy-18.patch
- ceph-17.2.6-mgr-dashboard-pylint-217.patch

Issue: #12
References: cherrypy/cherrypy@8245a74
References: GrahamDumpleton/wrapt#196
  • Loading branch information
bazaah committed May 12, 2023
1 parent 887c85e commit 6741cd4
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
10 changes: 10 additions & 0 deletions ceph-17.2.6-mgr-dashboard-cherrypy-18.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff --git a/src/pybind/mgr/dashboard/constraints.txt b/src/pybind/mgr/dashboard/constraints.txt
index 55f81c92dec..c3620497f42 100644
--- a/src/pybind/mgr/dashboard/constraints.txt
+++ b/src/pybind/mgr/dashboard/constraints.txt
@@ -1,4 +1,4 @@
-CherryPy~=13.1
+CherryPy~=18.7
more-itertools~=8.14
PyJWT~=2.0
bcrypt~=3.1
10 changes: 10 additions & 0 deletions ceph-17.2.6-mgr-dashboard-pylint-217.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff --git a/src/pybind/mgr/dashboard/requirements-lint.txt b/src/pybind/mgr/dashboard/requirements-lint.txt
index 1b15f46817c..89a6496098e 100644
--- a/src/pybind/mgr/dashboard/requirements-lint.txt
+++ b/src/pybind/mgr/dashboard/requirements-lint.txt
@@ -1,4 +1,4 @@
-pylint==2.6.0
+pylint==2.17.4
flake8==3.9.0
flake8-colors==0.1.6
#TODO: Fix docstring issues: https://tracker.ceph.com/issues/41224

0 comments on commit 6741cd4

Please sign in to comment.