From 5499782ff83ac7113274a8ee5ca0d93113e3e3c4 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Thu, 30 Jul 2020 09:55:08 +0200 Subject: [PATCH] python-common, spec.in: Add missing pyyaml dependency Fixes: cd6a488ab2ca036dd4fb36751b938f605e97e1c8 Fixes: https://tracker.ceph.com/issues/46759 Signed-off-by: Sebastian Wagner (cherry picked from commit 0ada965fafb36094194347deebd4778f47bbe407) Conflicts: src/python-common/setup.py picked both changes --- ceph.spec.in | 6 ++++++ src/python-common/setup.py | 1 + 2 files changed, 7 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index 23274268df648..70f4009de8f1a 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -991,6 +991,12 @@ descriptions, and submitting the command to the appropriate daemon. %package -n python%{python3_pkgversion}-ceph-common Summary: Python 3 utility libraries for Ceph +%if 0%{?fedora} || 0%{?rhel} >= 8 +Requires: python%{python3_pkgversion}-pyyaml +%endif +%if 0%{?suse_version} +Requires: python%{python3_pkgversion}-PyYAML +%endif %if 0%{?suse_version} Group: Development/Libraries/Python %endif diff --git a/src/python-common/setup.py b/src/python-common/setup.py index 48daee6dee4d7..a5bdaf9a9254f 100644 --- a/src/python-common/setup.py +++ b/src/python-common/setup.py @@ -18,6 +18,7 @@ setup( url="https://github.com/ceph/ceph", zip_safe = False, install_requires=( + 'pyyaml', 'six', ), classifiers = [ -- 2.39.5