Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python39 for openSUSE:Factory
checked in at 2021-06-23 17:38:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python39 (Old)
and /work/SRC/openSUSE:Factory/.python39.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python39"
Wed Jun 23 17:38:06 2021 rev:18 rq:900835 version:3.9.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/python39/python39.changes 2021-06-11
22:30:05.634069891 +0200
+++ /work/SRC/openSUSE:Factory/.python39.new.2625/python39.changes
2021-06-23 17:38:08.912464582 +0200
@@ -1,0 +2,6 @@
+Sat Jun 19 00:12:04 UTC 2021 - Matej Cepl <mc...@suse.com>
+
+- Add bpo44426-complex-keyword-sphinx.patch allowing generating
+ documentation with Sphinx 4 (bpo#44426).
+
+-------------------------------------------------------------------
New:
----
bpo44426-complex-keyword-sphinx.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python39.spec ++++++
--- /var/tmp/diff_new_pack.eHbfv0/_old 2021-06-23 17:38:09.616465550 +0200
+++ /var/tmp/diff_new_pack.eHbfv0/_new 2021-06-23 17:38:09.620465556 +0200
@@ -145,6 +145,10 @@
# PATCH-FIX-SLE skip-test_pyobject_freed_is_freed.patch mc...@suse.com
# skip a test failing on SLE-15
Patch34: skip-test_pyobject_freed_is_freed.patch
+# PATCH-FIX-UPSTREAM bpo44426-complex-keyword-sphinx.patch bpo#44426
mc...@suse.com
+# Use of 'complex' as a C variable name confuses Sphinx; change it to 'num'
+# The same goes for 'default', which I had to change to 'def_size'
+Patch35: bpo44426-complex-keyword-sphinx.patch
BuildRequires: autoconf-archive
BuildRequires: automake
BuildRequires: fdupes
@@ -391,6 +395,7 @@
%if 0%{?sle_version} && 0%{?sle_version} <= 150300
%patch34 -p1
%endif
+%patch35 -p1
# drop Autoconf version requirement
sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
++++++ bpo44426-complex-keyword-sphinx.patch ++++++
>From 29b463879b71a3ade67541c34daafb2929269fc4 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickin...@enthought.com>
Date: Wed, 16 Jun 2021 18:43:49 +0100
Subject: [PATCH] bpo-44426: Use of 'complex' as a C variable name confuses
Sphinx; change it to 'num'. (GH-26744) (cherry picked from commit
7247f6f433846c6e37308a550e8e5eb6be379856)
Co-authored-by: Mark Dickinson <mdickin...@enthought.com>
---
Doc/c-api/complex.rst | 4 ++--
Doc/c-api/object.rst | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- a/Doc/c-api/complex.rst
+++ b/Doc/c-api/complex.rst
@@ -46,9 +46,9 @@ pointers. This is consistent throughout
:c:type:`Py_complex` representation.
-.. c:function:: Py_complex _Py_c_neg(Py_complex complex)
+.. c:function:: Py_complex _Py_c_neg(Py_complex num)
- Return the negation of the complex number *complex*, using the C
+ Return the negation of the complex number *num*, using the C
:c:type:`Py_complex` representation.
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -483,12 +483,12 @@ Object Protocol
returned. This is the equivalent to the Python expression ``len(o)``.
-.. c:function:: Py_ssize_t PyObject_LengthHint(PyObject *o, Py_ssize_t default)
+.. c:function:: Py_ssize_t PyObject_LengthHint(PyObject *o, Py_ssize_t
def_size)
Return an estimated length for the object *o*. First try to return its
actual length, then an estimate using :meth:`~object.__length_hint__`, and
finally return the default value. On error return ``-1``. This is the
- equivalent to the Python expression ``operator.length_hint(o, default)``.
+ equivalent to the Python expression ``operator.length_hint(o, def_size)``.
.. versionadded:: 3.4
