Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2025-07-23 16:32:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new.8875 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf" Wed Jul 23 16:32:05 2025 rev:88 rq:1294971 version:31.1 Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf-java.changes 2025-06-23 14:50:40.933290367 +0200 +++ /work/SRC/openSUSE:Factory/.protobuf.new.8875/protobuf-java.changes 2025-07-23 16:32:21.456961009 +0200 @@ -1,0 +2,6 @@ +Mon Jul 21 10:01:22 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaub...@suse.com> + +- Cherry-pick protobuf-fix-google-imports.patch to fix import issues of + reverse-dependency packages within the google namespace (bsc#1244918) + +------------------------------------------------------------------- protobuf.changes: same change python-protobuf.changes: same change New: ---- protobuf-fix-google-imports.patch ----------(New B)---------- New:/work/SRC/openSUSE:Factory/.protobuf.new.8875/protobuf-java.changes- /work/SRC/openSUSE:Factory/.protobuf.new.8875/protobuf-java.changes:- Cherry-pick protobuf-fix-google-imports.patch to fix import issues of /work/SRC/openSUSE:Factory/.protobuf.new.8875/protobuf-java.changes- reverse-dependency packages within the google namespace (bsc#1244918) -- /work/SRC/openSUSE:Factory/.protobuf.new.8875/protobuf.changes- /work/SRC/openSUSE:Factory/.protobuf.new.8875/protobuf.changes:- Cherry-pick protobuf-fix-google-imports.patch to fix import issues of /work/SRC/openSUSE:Factory/.protobuf.new.8875/protobuf.changes- reverse-dependency packages within the google namespace (bsc#1244918) -- /work/SRC/openSUSE:Factory/.protobuf.new.8875/python-protobuf.changes- /work/SRC/openSUSE:Factory/.protobuf.new.8875/python-protobuf.changes:- Cherry-pick protobuf-fix-google-imports.patch to fix import issues of /work/SRC/openSUSE:Factory/.protobuf.new.8875/python-protobuf.changes- reverse-dependency packages within the google namespace (bsc#1244918) ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ protobuf.spec: same change ++++++ python-protobuf.spec ++++++ --- /var/tmp/diff_new_pack.21EGGx/_old 2025-07-23 16:32:22.777016238 +0200 +++ /var/tmp/diff_new_pack.21EGGx/_new 2025-07-23 16:32:22.777016238 +0200 @@ -27,6 +27,7 @@ Group: Development/Libraries/Python URL: https://github.com/protocolbuffers/protobuf Source0: https://files.pythonhosted.org/packages/source/p/protobuf/protobuf-%{version}.tar.gz +Patch0: https://github.com/protocolbuffers/protobuf/commit/8351926380c7cc91aae6df5695c91426e209f958.patch#/protobuf-fix-google-imports.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module pip} BuildRequires: %{python_module python-dateutil} @@ -43,7 +44,7 @@ This package contains the Python bindings for Google Protocol Buffers. %prep -%autosetup -p1 -n protobuf-%{version} +%autosetup -p2 -n protobuf-%{version} # The previous blank line is crucial for older system being able # to use the autosetup macro ++++++ protobuf-fix-google-imports.patch ++++++ >From 8351926380c7cc91aae6df5695c91426e209f958 Mon Sep 17 00:00:00 2001 From: Ge Yunxi <141423244+gy...@users.noreply.github.com> Date: Fri, 11 Jul 2025 11:04:58 -0700 Subject: [PATCH] drop-deprecated-pkg-resources-declare (#22442) # Description As of setuptools 81, pkg_resources.declare_namespace has been marked as deprecated (scheduled to be removed after 2025-11-30) so I remove it from init.py # Environment: a virtual machine of arch riscv64 # procedure I got this problem when running a test that applied this package. ``` src/certbot_dns_google/_internal/tests/dns_google_test.py:9: in <module> from google.auth import exceptions as googleauth_exceptions /usr/lib/python3.13/site-packages/google/__init__.py:2: in <module> __import__('pkg_resources').declare_namespace(__name__) ^^^^^^^^^^^^^^^^^^^^^^^^^^^ /usr/lib/python3.13/site-packages/pkg_resources/__init__.py:98: in <module> warnings.warn( E UserWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html. The pkg_resources package is slated for removal as early as 2025-11-30. Refrain from using this package or pin to Setuptools<81. ``` [certbot-dns-google-4.1.1-1-riscv64-check.log](https://github.com/user-attachments/files/20976539/certbot-dns-google-4.1.1-1-riscv64-check.log) Closes #22442 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/22442 from gyx47:patch-1 6aef5c9df150cce444910d224fe90b2a514c7868 PiperOrigin-RevId: 782041935 --- python/google/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/python/google/__init__.py b/python/google/__init__.py index 5585614122997..b36383a61027f 100644 --- a/python/google/__init__.py +++ b/python/google/__init__.py @@ -1,4 +1,3 @@ -try: - __import__('pkg_resources').declare_namespace(__name__) -except ImportError: - __path__ = __import__('pkgutil').extend_path(__path__, __name__) +from pkgutil import extend_path + +__path__ = extend_path(__path__, __name__)
