Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python for openSUSE:Factory checked
in at 2023-05-26 20:14:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python (Old)
and /work/SRC/openSUSE:Factory/.python.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python"
Fri May 26 20:14:54 2023 rev:183 rq:1088922 version:2.7.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/python/python-base.changes 2023-05-06
22:08:53.576616946 +0200
+++ /work/SRC/openSUSE:Factory/.python.new.1533/python-base.changes
2023-05-26 20:14:55.512066581 +0200
@@ -1,0 +2,7 @@
+Wed May 24 20:50:27 UTC 2023 - Matej Cepl <mc...@suse.com>
+
+- Add PygmentsBridge-trime_doctest_flags.patch to allow build of
+ the documentation even with the current Sphinx. (SUSE-ONLY
+ PATCH, DO NOT SEND UPSTREAM!)
+
+-------------------------------------------------------------------
python-doc.changes: same change
--- /work/SRC/openSUSE:Factory/python/python.changes 2023-05-06
22:08:53.620617191 +0200
+++ /work/SRC/openSUSE:Factory/.python.new.1533/python.changes 2023-05-26
20:14:55.592067058 +0200
@@ -2 +2 @@
-Fri May 5 11:29:25 UTC 2023 - Dominique Leuenberger <dims...@opensuse.org>
+Wed May 24 20:50:27 UTC 2023 - Matej Cepl <mc...@suse.com>
@@ -4,2 +4,3 @@
-- Add _multibuild to define 2nd spec file as additional flavor.
- Eliminates the need for source package links in OBS.
+- Add PygmentsBridge-trime_doctest_flags.patch to allow build of
+ the documentation even with the current Sphinx. (SUSE-ONLY
+ PATCH, DO NOT SEND UPSTREAM!)
New:
----
PygmentsBridge-trime_doctest_flags.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-base.spec ++++++
--- /var/tmp/diff_new_pack.gNy2UR/_old 2023-05-26 20:14:58.128082174 +0200
+++ /var/tmp/diff_new_pack.gNy2UR/_new 2023-05-26 20:14:58.188082532 +0200
@@ -146,13 +146,16 @@
# blocklist bypass via the urllib.parse component when supplying
# a URL that starts with blank characters
Patch75: CVE-2023-24329-blank-URL-bypass.patch
+# PATCH-FIX-OPENSUSE PygmentsBridge-trime_doctest_flags.patch mc...@suse.com
+# Build documentation even without PygmentsBridge.trim_doctest_flags
+Patch76: PygmentsBridge-trime_doctest_flags.patch
# COMMON-PATCH-END
%define python_version %(echo %{tarversion} | head -c 3)
BuildRequires: automake
BuildRequires: fdupes
BuildRequires: libbz2-devel
BuildRequires: libffi-devel
-%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1599
+%if 0%{?suse_version} && 0%{?suse_version} < 1599
BuildRequires: libnsl-devel
%endif
BuildRequires: pkg-config
@@ -293,6 +296,7 @@
%patch74 -p1
%endif
%patch75 -p1
+%patch76 -p1
# For patch 66
cp -v %{SOURCE66} Lib/test/recursion.tar
++++++ python-doc.spec ++++++
--- /var/tmp/diff_new_pack.gNy2UR/_old 2023-05-26 20:14:58.432083986 +0200
+++ /var/tmp/diff_new_pack.gNy2UR/_new 2023-05-26 20:14:58.476084248 +0200
@@ -27,8 +27,8 @@
Source0: %{tarname}.tar.xz
# docs for current version are regenerated every day
# this messes with autobuild "file changed" checks
-#Source2:
https://docs.python.org/%{version}/archives/python-%{pyver}-docs-pdf-a4.tar.bz2
-#Source3:
https://docs.python.org/%{version}/archives/python-%{pyver}-docs-pdf-letter.tar.bz2
+#Source2:
https://docs.python.org/%%{version}/archives/python-%%{pyver}-docs-pdf-a4.tar.bz2
+#Source3:
https://docs.python.org/%%{version}/archives/python-%%{pyver}-docs-pdf-letter.tar.bz2
Source2: python-%{version}-docs-pdf-a4.tar.bz2
Source3: python-%{version}-docs-pdf-letter.tar.bz2
# For Patch 66
@@ -145,6 +145,9 @@
# blocklist bypass via the urllib.parse component when supplying
# a URL that starts with blank characters
Patch75: CVE-2023-24329-blank-URL-bypass.patch
+# PATCH-FIX-OPENSUSE PygmentsBridge-trime_doctest_flags.patch mc...@suse.com
+# Build documentation even without PygmentsBridge.trim_doctest_flags
+Patch76: PygmentsBridge-trime_doctest_flags.patch
# COMMON-PATCH-END
Provides: pyth_doc = %{version}
Provides: pyth_ps = %{version}
@@ -229,6 +232,7 @@
%patch74 -p1
%endif
%patch75 -p1
+%patch76 -p1
# For patch 66
cp -v %{SOURCE66} Lib/test/recursion.tar
@@ -270,7 +274,7 @@
%dir %{_docdir}/python
%doc %{_docdir}/python/Misc
%doc %{_docdir}/python/html
-#%doc %{_docdir}/python/README
+#%%doc %%{_docdir}/python/README
%files pdf
%defattr(644,root,root,755)
++++++ python.spec ++++++
--- /var/tmp/diff_new_pack.gNy2UR/_old 2023-05-26 20:14:58.716085679 +0200
+++ /var/tmp/diff_new_pack.gNy2UR/_new 2023-05-26 20:14:58.756085917 +0200
@@ -145,6 +145,9 @@
# blocklist bypass via the urllib.parse component when supplying
# a URL that starts with blank characters
Patch75: CVE-2023-24329-blank-URL-bypass.patch
+# PATCH-FIX-OPENSUSE PygmentsBridge-trime_doctest_flags.patch mc...@suse.com
+# Build documentation even without PygmentsBridge.trim_doctest_flags
+Patch76: PygmentsBridge-trime_doctest_flags.patch
# COMMON-PATCH-END
BuildRequires: automake
BuildRequires: db-devel
@@ -347,6 +350,7 @@
%patch74 -p1
%endif
%patch75 -p1
+%patch76 -p1
# For patch 66
cp -v %{SOURCE66} Lib/test/recursion.tar
++++++ PygmentsBridge-trime_doctest_flags.patch ++++++
---
Doc/tools/extensions/pyspecific.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
--- a/Doc/tools/extensions/pyspecific.py
+++ b/Doc/tools/extensions/pyspecific.py
@@ -31,14 +31,17 @@ Body.enum.converters['loweralpha'] = \
# doctest docs themselves
orig_visit_literal_block = HTMLTranslator.visit_literal_block
def new_visit_literal_block(self, node):
+ old_trim_doctest_flags = None
meta = self.builder.env.metadata[self.builder.current_docname]
- old_trim_doctest_flags = self.highlighter.trim_doctest_flags
- if 'keepdoctest' in meta:
- self.highlighter.trim_doctest_flags = False
+ if hasattr(self.highlighter, 'trim_doctest_flags'):
+ old_trim_doctest_flags = self.highlighter.trim_doctest_flags
+ if 'keepdoctest' in meta:
+ self.highlighter.trim_doctest_flags = False
try:
orig_visit_literal_block(self, node)
finally:
- self.highlighter.trim_doctest_flags = old_trim_doctest_flags
+ if old_trim_doctest_flags is not None:
+ self.highlighter.trim_doctest_flags = old_trim_doctest_flags
HTMLTranslator.visit_literal_block = new_visit_literal_block
