Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-sphinxcontrib-blockdiag for
openSUSE:Factory checked in at 2026-10-07 19:32:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-blockdiag (Old)
and
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-blockdiag.new.3698736 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sphinxcontrib-blockdiag"
Wed Oct 7 19:32:51 2026 rev:9 rq:1382893 version:3.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-sphinxcontrib-blockdiag/python-sphinxcontrib-blockdiag.changes
2025-06-12 18:11:33.760890404 +0200
+++
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-blockdiag.new.3698736/python-sphinxcontrib-blockdiag.changes
2026-10-07 19:33:20.953504794 +0200
@@ -1,0 +2,6 @@
+Wed Oct 7 03:45:29 UTC 2026 - Steve Kowalik <[email protected]>
+
+- Add patch no-more-pkg-resources.patch:
+ * Use importlib.metadata to determine versions.
+
+-------------------------------------------------------------------
New:
----
no-more-pkg-resources.patch
----------(New B)----------
New:
- Add patch no-more-pkg-resources.patch:
* Use importlib.metadata to determine versions.
----------(New E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sphinxcontrib-blockdiag.spec ++++++
--- /var/tmp/diff_new_pack.3ubEom/_old 2026-10-07 19:33:22.280560215 +0200
+++ /var/tmp/diff_new_pack.3ubEom/_new 2026-10-07 19:33:22.282560299 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-sphinxcontrib-blockdiag
#
-# Copyright (c) 2025 SUSE LLC
+# 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
@@ -36,6 +36,7 @@
# PATCH-FEATURE-UPSTREAM 25.patch gh#blockdiag/sphinxcontrib-blockdiag#25
Patch0:
https://patch-diff.githubusercontent.com/raw/blockdiag/sphinxcontrib-blockdiag/pull/25.patch
Patch1: remove-mock.patch
+Patch2: no-more-pkg-resources.patch
BuildRequires: %{python_module Sphinx >= 2.0}
BuildRequires: %{python_module blockdiag >= 1.5.0}
BuildRequires: %{python_module pip}
@@ -78,9 +79,8 @@
%files %{python_files}
%license LICENSE
%doc AUTHORS README.rst
-%{python_sitelib}/sphinxcontrib/blockdiag.py*
+%{python_sitelib}/sphinxcontrib/blockdiag.py
%pycache_only %{python_sitelib}/sphinxcontrib/__pycache__
-%{python_sitelib}/sphinxcontrib_blockdiag-%{version}-py*-nspkg.pth
-%{python_sitelib}/sphinxcontrib_blockdiag-%{version}*-info
+%{python_sitelib}/sphinxcontrib_blockdiag-%{version}.dist-info
%endif
++++++ no-more-pkg-resources.patch ++++++
Index: sphinxcontrib-blockdiag-3.0.0/sphinxcontrib/__init__.py
===================================================================
--- sphinxcontrib-blockdiag-3.0.0.orig/sphinxcontrib/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
- sphinxcontrib
- ~~~~~~~~~~~~~
-
- This package is a namespace package that contains all extensions
- distributed in the ``sphinx-contrib`` distribution.
-
- :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
- :license: BSD, see LICENSE for details.
-"""
-
-__import__('pkg_resources').declare_namespace(__name__)
Index: sphinxcontrib-blockdiag-3.0.0/sphinxcontrib/blockdiag.py
===================================================================
--- sphinxcontrib-blockdiag-3.0.0.orig/sphinxcontrib/blockdiag.py
+++ sphinxcontrib-blockdiag-3.0.0/sphinxcontrib/blockdiag.py
@@ -14,9 +14,9 @@ import os
import re
import posixpath
import traceback
-import pkg_resources
from collections import namedtuple
from docutils import nodes
+from importlib.metadata import version
from sphinx import addnodes
from sphinx.util import logging
from sphinx.util.osutil import ensuredir
@@ -312,7 +312,7 @@ def setup(app):
app.connect("doctree-resolved", on_doctree_resolved)
return {
- 'version': pkg_resources.require('blockdiag')[0].version,
+ 'version': version('blockdiag'),
'parallel_read_safe': True,
'parallel_write_safe': True,
}
Index: sphinxcontrib-blockdiag-3.0.0/setup.py
===================================================================
--- sphinxcontrib-blockdiag-3.0.0.orig/setup.py
+++ sphinxcontrib-blockdiag-3.0.0/setup.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
requires = ['blockdiag>=1.5.0', 'Sphinx>=2.0']
@@ -33,9 +33,8 @@ setup(
'Topic :: Utilities',
],
platforms='any',
- packages=find_packages(exclude=['tests']),
+ packages=find_namespace_packages(where=".", exclude=['tests*']),
include_package_data=True,
python_requires=">=3.7",
install_requires=requires,
- namespace_packages=['sphinxcontrib'],
)
