From 9473367fe84dc2a9a3371219ebf405acd2a8ef35 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Jul 29 2022 07:15:05 +0000 Subject: Fix FTBFS with Python 3.11b4 --- diff --git a/13714.patch b/13714.patch new file mode 100644 index 0000000..8ccb38a --- /dev/null +++ b/13714.patch @@ -0,0 +1,28 @@ +From d858213d4088237e1481038865bc52ccdd074053 Mon Sep 17 00:00:00 2001 +From: Lumir Balhar +Date: Fri, 29 Jul 2022 08:48:59 +0200 +Subject: [PATCH] xxlimited_35 module now has the same name in repr in Py 3.11 + +See https://github.com/python/cpython/commit/a87c9b538fbfc42883417c4d5e69f1a5922690e3 +--- + IPython/lib/tests/test_pretty.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py +index 86085166071..b93ab97eb9e 100644 +--- a/IPython/lib/tests/test_pretty.py ++++ b/IPython/lib/tests/test_pretty.py +@@ -141,9 +141,12 @@ def test_pprint_heap_allocated_type(): + Test that pprint works for heap allocated types. + """ + module_name = "xxlimited" if sys.version_info < (3, 10) else "xxlimited_35" ++ expected_output = ( ++ "xxlimited.Null" if sys.version_info < (3, 11) else "xxlimited_35.Null" ++ ) + xxlimited = pytest.importorskip(module_name) + output = pretty.pretty(xxlimited.Null) +- assert output == "xxlimited.Null" ++ assert output == expected_output + + + def test_pprint_nomod(): diff --git a/ipython.spec b/ipython.spec index 9603142..8d2f4ce 100644 --- a/ipython.spec +++ b/ipython.spec @@ -14,7 +14,7 @@ Name: ipython Version: 8.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An enhanced interactive Python shell # See bug #603178 for a quick overview for the choice of licenses @@ -23,6 +23,8 @@ Summary: An enhanced interactive Python shell License: (BSD and MIT and Python) and GPLv2+ URL: http://ipython.org/ Source0: %pypi_source +# Fix for Python 3.11b4 +Patch: https://github.com/ipython/ipython/pull/13714.patch BuildArch: noarch BuildRequires: make @@ -255,6 +257,9 @@ rm -r %{buildroot}%{python3_sitelib}/IPython/*/tests %changelog +* Fri Jul 29 2022 Lumír Balhar - 8.4.0-5 +- Fix FTBFS with Python 3.11b4 + * Thu Jul 21 2022 Fedora Release Engineering - 8.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild