From 50033bc32455235d7e377fac7fd79bdf4d9040f8 Mon Sep 17 00:00:00 2001
From: Karanraj Chauhan <chauhank@bu.edu>
Date: Wed, 30 Oct 2019 12:17:35 -0400
Subject: [PATCH] mgr/diskprediction_local: Updated dependencies in
 ceph.spec.in, debian/control to match requirements.txt

Added pandas dependency to ceph.spec.in and debian/control.

In the spirit of "if it aint broke, dont fix it", I did NOT add
scikit-learn as a dependency in spec or control, because scikit-learn
was already a dependency in diskprediction_local, and so it should have
already have been taken care of.

Also in the same spirit, removed joblib dependency from requirements.txt
because scikit-learn depends on it and therefore joblib will get
installed when scikit-learn gets installed.

Signed-off-by: Karanraj Chauhan <kachauha@redhat.com>
---
 ceph.spec.in                                         | 3 +++
 debian/control                                       | 1 +
 src/pybind/mgr/diskprediction_local/requirements.txt | 1 -
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ceph.spec.in b/ceph.spec.in
index 519f0d257b57d..50d1ff0027272 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -537,13 +537,16 @@ Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:       python%{_python_buildid}-numpy
 %if 0%{without python2}
 Requires:       python3-scipy
+Requires:       python3-pandas
 %else
 Requires:       python2-scipy
+Requires:       python2-pandas
 %endif
 %endif
 %if 0%{?rhel} == 7
 Requires:       numpy
 Requires:       scipy
+Requires:       pandas
 %endif
 %description mgr-diskprediction-local
 ceph-mgr-diskprediction-local is a ceph-mgr plugin that tries to predict
diff --git a/debian/control b/debian/control
index 3f43f25e776e3..0c8d51ac2c9fd 100644
--- a/debian/control
+++ b/debian/control
@@ -269,6 +269,7 @@ Depends: ceph-mgr (= ${binary:Version}),
          python-numpy,
          python-scipy,
          python-sklearn,
+         python-pandas,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
diff --git a/src/pybind/mgr/diskprediction_local/requirements.txt b/src/pybind/mgr/diskprediction_local/requirements.txt
index 4bfcec0fcc987..f524b07a1e745 100644
--- a/src/pybind/mgr/diskprediction_local/requirements.txt
+++ b/src/pybind/mgr/diskprediction_local/requirements.txt
@@ -1,5 +1,4 @@
 numpy==1.15.1
 scipy==1.1.0
 pandas==0.23.4
-joblib==0.11
 scikit-learn==0.19.2
-- 
2.39.5