Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package whipper for openSUSE:Factory checked in at 2026-10-13 17:48:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/whipper (Old) and /work/SRC/openSUSE:Factory/.whipper.new.3698736 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "whipper" Tue Oct 13 17:48:55 2026 rev:11 rq:1384581 version:0.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/whipper/whipper.changes 2025-09-16 18:20:03.951307556 +0200 +++ /work/SRC/openSUSE:Factory/.whipper.new.3698736/whipper.changes 2026-10-13 17:49:13.842086447 +0200 @@ -1,0 +2,11 @@ +Tue Oct 13 11:11:14 UTC 2026 - Dr. Werner Fink <[email protected]> + +- Make it build again (boo#1285053) + +------------------------------------------------------------------- +Tue Oct 13 10:52:01 UTC 2026 - Dr. Werner Fink <[email protected]> + +- Add upstream commit adab2598 as patch 0001-No-longer-rely-on-pkg_resources.patch + to fix boo#1285053 + +------------------------------------------------------------------- New: ---- 0001-No-longer-rely-on-pkg_resources.patch ----------(New B)---------- New: - Add upstream commit adab2598 as patch 0001-No-longer-rely-on-pkg_resources.patch to fix boo#1285053 ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ whipper.spec ++++++ --- /var/tmp/diff_new_pack.lQuudV/_old 2026-10-13 17:49:16.093180809 +0200 +++ /var/tmp/diff_new_pack.lQuudV/_new 2026-10-13 17:49:16.095180892 +0200 @@ -1,7 +1,7 @@ # # spec file for package whipper # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,10 +26,12 @@ Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH_UPSTREAM Patch0: e0942417a1c267781a8b676789730457dcb2e6fa.patch +Patch1: 0001-No-longer-rely-on-pkg_resources.patch BuildRequires: fdupes BuildRequires: gobject-introspection BuildRequires: libsndfile-devel BuildRequires: python-rpm-macros +BuildRequires: python3-base BuildRequires: python3-devel BuildRequires: python3-gobject BuildRequires: python3-setuptools @@ -41,10 +43,13 @@ BuildRequires: python3-discid BuildRequires: python3-musicbrainzngs BuildRequires: python3-mutagen +BuildRequires: python3-packaging +BuildRequires: python3-pip BuildRequires: python3-pycdio BuildRequires: python3-pytest BuildRequires: python3-ruamel.yaml BuildRequires: python3-setuptools +BuildRequires: python3-wheel BuildRequires: sox # /SECTION # nb: there is a difference between cd-paranoia [we want] and @@ -52,13 +57,6 @@ Requires: cd-paranoia >= 10.2 Requires: cdrdao Requires: flac -Requires: python3-discid -Requires: python3-gobject -Requires: python3-musicbrainzngs -Requires: python3-mutagen -Requires: python3-pycdio -Requires: python3-ruamel.yaml -Requires: python3-setuptools Requires: sox Conflicts: morituri @@ -73,10 +71,10 @@ %build echo "Version: %{version}" > PKG-INFO -%python3_build +%python3_pyproject_wheel %install -%python3_install +%python3_pyproject_install %fdupes %{buildroot}%{python3_sitearch} %check @@ -92,6 +90,6 @@ %{_bindir}/whipper %{python3_sitearch}/whipper %{python3_sitearch}/accuraterip.cpython* -%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info +%{python3_sitearch}/%{name}-%{version}.dist-info/ %{_datadir}/metainfo/com.github.whipper_team.Whipper.metainfo.xml ++++++ 0001-No-longer-rely-on-pkg_resources.patch ++++++ >From adab25986f38d1bf5e8766f6b0f301c1acf2ec49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katharina=20Dr=C3=B6ge?= <[email protected]> Date: Wed, 24 Sep 2025 21:52:02 +0200 Subject: [PATCH] No longer rely on `pkg_resources` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Katharina Dröge <[email protected]> --- README.md | 20 ++------------------ whipper/__init__.py | 8 ++++---- whipper/command/main.py | 21 +-------------------- whipper/common/program.py | 5 +++-- whipper/result/result.py | 4 ++-- 5 files changed, 12 insertions(+), 46 deletions(-) --- a/README.md +++ b/README.md 2026-10-13 10:42:04.992928729 +0000 @@ -297,24 +297,8 @@ The available plugins can be listed with whipper cd rip -L eac ``` -Whipper searches for logger plugins in the following paths: - -- `$XDG_DATA_HOME/whipper/plugins` -- Paths returned by the following Python instruction: - - `[x + '/whipper/plugins' for x in site.getsitepackages()]` - -- If whipper is run in a `virtualenv`, it will use these alternative instructions (from `distutils.sysconfig`): - - `get_python_lib(plat_specific=False, standard_lib=False, prefix='/usr/local') + '/whipper/plugins'` - - `get_python_lib(plat_specific=False, standard_lib=False) + '/whipper/plugins'` - -On a default Debian/Ubuntu installation, the following paths are searched by whipper: - -- `$HOME/.local/share/whipper/plugins` -- `/usr/local/lib/python3.X/dist-packages/whipper/plugins` -- `/usr/lib/python3.X/dist-packages/whipper/plugins` - -Where `X` stands for the minor version of the Python 3 release available on the system. +Whipper searches for logger plugins using `importlib.metadata.entry_points`, meaning any package visible to the Python +interpreter exporting a `whipper.logger` entry point will be loaded. Please note that locally installed logger plugins won't be recognized when whipper has been installed through the official Docker image. --- a/whipper/__init__.py +++ b/whipper/__init__.py 2026-10-13 10:42:05.012928371 +0000 @@ -2,11 +2,11 @@ import logging import os import sys -from pkg_resources import (get_distribution, - DistributionNotFound, RequirementParseError) +from importlib.metadata import version, PackageNotFoundError + try: - __version__ = get_distribution(__name__).version -except (DistributionNotFound, RequirementParseError): + __version__ = version('whipper') +except PackageNotFoundError: # not installed as package or is being run from source/git checkout from setuptools_scm import get_version __version__ = get_version() --- a/whipper/command/main.py +++ b/whipper/command/main.py 2026-10-13 10:42:05.024928156 +0000 @@ -3,14 +3,11 @@ import os import sys -import pkg_resources import musicbrainzngs -import site import whipper -from distutils.sysconfig import get_python_lib from whipper.command import cd, offset, drive, image, accurip, mblookup from whipper.command.basecommand import BaseCommand -from whipper.common import common, directory, config +from whipper.common import common, config from whipper.extern.task import task from whipper.program.utils import eject_device @@ -35,22 +32,6 @@ def main(): "to make it work in whipper.", server['netloc']) musicbrainzngs.set_hostname(server['netloc']) - # Find whipper's plugins paths (local paths have higher priority) - plugins_p = [directory.data_path('plugins')] # local path (in $HOME) - if hasattr(sys, 'real_prefix'): # no getsitepackages() in virtualenv - plugins_p.append( - get_python_lib(plat_specific=False, standard_lib=False, - prefix='/usr/local') + '/whipper/plugins') - plugins_p.append(get_python_lib(plat_specific=False, - standard_lib=False) + '/whipper/plugins') - else: - plugins_p += [x + '/whipper/plugins' for x in site.getsitepackages()] - - # register plugins with pkg_resources - distributions, _ = pkg_resources.working_set.find_plugins( - pkg_resources.Environment(plugins_p) - ) - list(map(pkg_resources.working_set.add, distributions)) try: cmd = Whipper(sys.argv[1:], os.path.basename(sys.argv[0]), None) ret = cmd.do() --- a/whipper/common/program.py +++ b/whipper/common/program.py 2026-10-13 10:42:05.036927941 +0000 @@ -27,6 +27,8 @@ import shutil import time from tempfile import NamedTemporaryFile +from packaging.version import Version + from whipper.common import accurip, checksum, common, mbngs, path from whipper.program import cdrdao, cdparanoia from whipper.result import result @@ -98,9 +100,8 @@ class Program: Also warn about buggy cdrdao versions. """ - from pkg_resources import parse_version as V version = cdrdao.version() - if V(version) < V('1.2.3rc2'): + if Version(version) < Version('1.2.3rc2'): logger.warning('cdrdao older than 1.2.3 has a pre-gap length bug.' ' See http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=102171') # noqa: E501 --- a/whipper/result/result.py +++ b/whipper/result/result.py 2026-10-13 10:42:05.052927655 +0000 @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with whipper. If not, see <http://www.gnu.org/licenses/>. -import pkg_resources +from importlib.metadata import entry_points import time @@ -157,7 +157,7 @@ def getLoggers(): """ d = {} - pluggables = list(pkg_resources.iter_entry_points("whipper.logger")) + pluggables = list(entry_points(group="whipper.logger")) for entrypoint in [EntryPoint(), ] + pluggables: plugin_class = entrypoint.load() d[entrypoint.name] = plugin_class
