From 46cb6846a9be9917602dad092346dcc0da772aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Fri, 22 Sep 2023 14:26:22 +0200 Subject: [PATCH] Avoid needless pkg_resources import in pythonbundles.py --- .python-rpm-generators.metadata | 1 + python-rpm-generators.spec | 6 +++++- pythonbundles.py | 5 ----- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 .python-rpm-generators.metadata diff --git a/.python-rpm-generators.metadata b/.python-rpm-generators.metadata new file mode 100644 index 0000000..bf27f40 --- /dev/null +++ b/.python-rpm-generators.metadata @@ -0,0 +1 @@ +f9c244a5385fbf619fdd0718ed66ac4c9df914cf test-sources-2021-03-11.tar.gz diff --git a/python-rpm-generators.spec b/python-rpm-generators.spec index 8999c5d..51dfe87 100644 --- a/python-rpm-generators.spec +++ b/python-rpm-generators.spec @@ -1,7 +1,7 @@ Name: python-rpm-generators Summary: Dependency generators for Python RPMs Version: 12 -Release: 8%{?dist} +Release: 9%{?dist} # Originally all those files were part of RPM, so license is kept here License: GPLv2+ @@ -47,6 +47,10 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} *.py %{_rpmconfigdir}/pythonbundles.py %changelog +* Fri Sep 22 2023 Tomáš Hrnčiar - 12-9 +- Avoid needless pkg_resources import in pythonbundles.py +- Resolves: RHEL-6110 + * Wed Jan 26 2022 Tomas Orsava - 12-8 - From `python3-foo` packages automatically generate `python3.X-foo` Obsoletes tags on CentOS/RHEL diff --git a/pythonbundles.py b/pythonbundles.py index 96e817e..3d784ae 100755 --- a/pythonbundles.py +++ b/pythonbundles.py @@ -15,12 +15,7 @@ import pathlib import sys -# inject parse_version import to pythondistdeps -# not the nicest API, but :/ -from pkg_resources import parse_version import pythondistdeps -pythondistdeps.parse_version = parse_version - def generate_bundled_provides(path, namespace): provides = set()