From 47a95338c998e202c14e622e22def1250e2ac8f6 Mon Sep 17 00:00:00 2001 From: Miro HronĨok Date: Jul 17 2023 12:19:45 +0000 Subject: Use dnf-3 on the CI to workaround https://bugzilla.redhat.com/2223347 --- diff --git a/tests/all_supplementing_pythons.py b/tests/all_supplementing_pythons.py index 728e6c3..223bdf1 100755 --- a/tests/all_supplementing_pythons.py +++ b/tests/all_supplementing_pythons.py @@ -50,14 +50,14 @@ for python in sorted(tested_pythons): # Get all packages that supplement tox, # no repo explicitly specified means we use the enabled repos on the CI system which should be what we want -repoquery_result = subprocess.check_output(['dnf', 'repoquery', '--whatsupplements', 'tox'], text=True) +repoquery_result = subprocess.check_output(['dnf-3', 'repoquery', '--whatsupplements', 'tox'], text=True) supplementing_pkgs = set(repoquery_result.splitlines()) # It gets quite tricky, since packages like "pypy" can supplement tox, we get a set of provides for all of them supplementing_pkgs_provides = {} for nvra in supplementing_pkgs: - repoquery_result = subprocess.check_output(['dnf', '-q', 'repoquery', '--provides', nvra], text=True) + repoquery_result = subprocess.check_output(['dnf-3', '-q', 'repoquery', '--provides', nvra], text=True) provides = set(repoquery_result.splitlines()) unversioned_provides = {provide.split(' ')[0] for provide in provides} supplementing_pkgs_provides[nvra.rsplit('-', 2)[0]] = unversioned_provides diff --git a/tests/tests.yml b/tests/tests.yml index 9a9a3c2..61bd878 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -89,7 +89,7 @@ - python2-devel - pypy3.9-devel - python3-tox - - dnf + - python3-dnf - mock - rpmdevtools - rpm-build