From: Karanraj Chauhan <chauhank@bu.edu>
Date: Wed, 30 Oct 2019 16:17:35 +0000 (-0400)
Subject: mgr/diskprediction_local: Updated dependencies in ceph.spec.in, debian/control to... 
X-Git-Tag: v15.1.0~981^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50033bc32455235d7e377fac7fd79bdf4d9040f8;p=ceph.git

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>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 519f0d257b57..50d1ff002727 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 3f43f25e776e..0c8d51ac2c9f 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 4bfcec0fcc98..f524b07a1e74 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