Skip to content

Commit e96b6cf

Browse files
authored
Merge pull request ceph#59204 from tchaikov/wip-ceph-volume-deps
ceph-volume: add "packaging" to install_requires
2 parents f88d0c9 + 729fd8e commit e96b6cf

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
@@ -979,7 +979,6 @@ Requires: parted
979979
Requires: util-linux
980980
Requires: xfsprogs
981981
Requires: python%{python3_pkgversion}-setuptools
982-
Requires: python%{python3_pkgversion}-packaging
983982
Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
984983
%description volume
985984
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)