ceph-volume: add "packaging" to install_requires

in 0985e201, "packaging" was introduced as a runtime dependency of
ceph-volume, and `ceph.spec.in` was updated accordingly to note
this new dependency. but the debian packaging was not updated.

in 80edcd40, the missing dependency was added to debian/control as
one of ceph-volume's runtime dependency.

but dh_python3 is able to figure out the dependencies by reading
the egg's metadata of the ceph-volume python module. and as a
python project, ceph-volume is using its `setup.py` for
tracking its dependencies.

so in order to be more consistent, and keep all of its dependencies
in one place, let's move this dependency to setup.py . as the
packagings in both distros are able to figure the dependencies
from egg-info.

see also
- https://manpages.debian.org/testing/dh-python/dh_python3.1.en.html#dependencies
- https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_201x/#_automatically_generated_dependencies

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 729fd8e25ff2bfbcf99790d6cd08489d1c4e2ede)

diff --git a/ceph.spec.in b/ceph.spec.in
index 3dbbdc5c29f782661abbc0fa5498a9d61a68ed56..3c0cefd0d04911aa8dc09c7942817745d2530abd 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -893,7 +893,6 @@ Requires: parted
 Requires: util-linux
 Requires: xfsprogs
 Requires: python%{python3_pkgversion}-setuptools
-Requires: python%{python3_pkgversion}-packaging
 Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
 %description volume
 This package contains a tool to deploy OSD with different devices like

diff --git a/debian/control b/debian/control
index 0c5647971fb49bb200647c09b08595fa0198de36..ddba52be7bb00bdf1ad95887406208366d530176 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -452,7 +452,6 @@ Depends: ceph-osd (= ${binary:Version}),
          e2fsprogs,
          lvm2,
          parted,
-         python3-packaging,
          xfsprogs,
          ${misc:Depends},
          ${python3:Depends}

diff --git a/src/ceph-volume/setup.py b/src/ceph-volume/setup.py
index 44a0d0e468997f67869b29d4fa6cb37c5f7c1e2b..fa49a95cdd057aa03ee4462f75673e9be53ac5ee 100644 (file)
--- a/src/ceph-volume/setup.py
+++ b/src/ceph-volume/setup.py
@@ -14,7 +14,10 @@ setup(
     keywords='ceph volume disk devices lvm',
     url="https://github.com/ceph/ceph",
     zip_safe = False,
-    install_requires='ceph',
+    install_requires=[
+        'ceph',
+        'packaging',
+    ],
     dependency_links=[''.join(['file://', os.path.join(os.getcwd(), '../',
                                                        'python-common#egg=ceph-1.0.0')])],
     tests_require=[