From 6741cd4f9ed31bd006039449a8752eb222e2d68e Mon Sep 17 00:00:00 2001
From: Bazaah <github@luxolus.com>
Date: Fri, 12 May 2023 16:58:42 +0000
Subject: [PATCH] repo: mgr/dashboard deps pylint->2.17, cherrypy->18

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: https://github.com/bazaah/aur-ceph/issues/12
References: https://github.com/cherrypy/cherrypy/commit/8245a74aa4e090c40445535a9ce3997ed9904798
References: https://github.com/GrahamDumpleton/wrapt/issues/196
---
 ceph-17.2.6-mgr-dashboard-cherrypy-18.patch | 10 ++++++++++
 ceph-17.2.6-mgr-dashboard-pylint-217.patch  | 10 ++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 ceph-17.2.6-mgr-dashboard-cherrypy-18.patch
 create mode 100644 ceph-17.2.6-mgr-dashboard-pylint-217.patch

diff --git a/ceph-17.2.6-mgr-dashboard-cherrypy-18.patch b/ceph-17.2.6-mgr-dashboard-cherrypy-18.patch
new file mode 100644
index 0000000..676b1c6
--- /dev/null
+++ b/ceph-17.2.6-mgr-dashboard-cherrypy-18.patch
@@ -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
diff --git a/ceph-17.2.6-mgr-dashboard-pylint-217.patch b/ceph-17.2.6-mgr-dashboard-pylint-217.patch
new file mode 100644
index 0000000..cf97a26
--- /dev/null
+++ b/ceph-17.2.6-mgr-dashboard-pylint-217.patch
@@ -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