Skip to content

Commit 729fd8e

Browse files
committed
ceph-volume: add "packaging" to install_requires
in 0985e20, "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 80edcd4, 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 <[email protected]>
1 parent 2b06a57 commit 729fd8e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

ceph.spec.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,6 @@ Requires: parted
977977
Requires: util-linux
978978
Requires: xfsprogs
979979
Requires: python%{python3_pkgversion}-setuptools
980-
Requires: python%{python3_pkgversion}-packaging
981980
Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
982981
%description volume
983982
This package contains a tool to deploy OSD with different devices like

debian/control

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,6 @@ Depends: ceph-osd (= ${binary:Version}),
456456
e2fsprogs,
457457
lvm2,
458458
parted,
459-
python3-packaging,
460459
xfsprogs,
461460
${misc:Depends},
462461
${python3:Depends}

src/ceph-volume/setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
keywords='ceph volume disk devices lvm',
1515
url="https://github.com/ceph/ceph",
1616
zip_safe = False,
17-
install_requires='ceph',
17+
install_requires=[
18+
'ceph',
19+
'packaging',
20+
],
1821
dependency_links=[''.join(['file://', os.path.join(os.getcwd(), '../',
1922
'python-common#egg=ceph-1.0.0')])],
2023
tests_require=[

0 commit comments

Comments
 (0)