Skip to content

Commit 9b35e44

Browse files
bnavigatorbmwiedemann
bnavigator
authored and
bmwiedemann
committed
Update python-ipython to version 8.4.0 / rev 32 via SR 993332
https://build.opensuse.org/request/show/993332 by user bnavigator + dimstar_suse - Add ipython-pr13714-xxlimited.patch gh#ipython/ipython#13714 - Remove nbformat from the :test flavor. Run locally `--with localtests` for not skipping the tests.
1 parent 481cda1 commit 9b35e44

5 files changed

Lines changed: 59 additions & 3 deletions

File tree

‎packages/p/python-ipython/.files‎

69 Bytes
Binary file not shown.

‎packages/p/python-ipython/.rev‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,4 +1134,15 @@
11341134
<comment></comment>
11351135
<requestid>980869</requestid>
11361136
</revision>
1137+
<revision rev="32" vrev="2">
1138+
<srcmd5>8e53aa2a4f9d943499efa13aaa30dcff</srcmd5>
1139+
<version>8.4.0</version>
1140+
<time>1659721826</time>
1141+
<user>dimstar_suse</user>
1142+
<comment>- Add ipython-pr13714-xxlimited.patch gh#ipython/ipython#13714
1143+
1144+
- Remove nbformat from the :test flavor. Run locally
1145+
`--with localtests` for not skipping the tests.</comment>
1146+
<requestid>993332</requestid>
1147+
</revision>
11371148
</revisionlist>

‎packages/p/python-ipython/ipython-pr13714-xxlimited.patch‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From d858213d4088237e1481038865bc52ccdd074053 Mon Sep 17 00:00:00 2001
2+
From: Lumir Balhar <lbalhar@redhat.com>
3+
Date: Fri, 29 Jul 2022 08:48:59 +0200
4+
Subject: [PATCH] xxlimited_35 module now has the same name in repr in Py 3.11
5+
6+
See https://github.com/python/cpython/commit/a87c9b538fbfc42883417c4d5e69f1a5922690e3
7+
---
8+
IPython/lib/tests/test_pretty.py | 5 ++++-
9+
1 file changed, 4 insertions(+), 1 deletion(-)
10+
11+
diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
12+
index 86085166071..b93ab97eb9e 100644
13+
--- a/IPython/lib/tests/test_pretty.py
14+
+++ b/IPython/lib/tests/test_pretty.py
15+
@@ -141,9 +141,12 @@ def test_pprint_heap_allocated_type():
16+
Test that pprint works for heap allocated types.
17+
"""
18+
module_name = "xxlimited" if sys.version_info < (3, 10) else "xxlimited_35"
19+
+ expected_output = (
20+
+ "xxlimited.Null" if sys.version_info < (3, 10, 6) else "xxlimited_35.Null"
21+
+ )
22+
xxlimited = pytest.importorskip(module_name)
23+
output = pretty.pretty(xxlimited.Null)
24+
- assert output == "xxlimited.Null"
25+
+ assert output == expected_output
26+
27+
28+
def test_pprint_nomod():

‎packages/p/python-ipython/python-ipython.changes‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
-------------------------------------------------------------------
2+
Fri Aug 5 13:54:20 UTC 2022 - Ben Greiner <code@bnavigator.de>
3+
4+
- Add ipython-pr13714-xxlimited.patch gh#ipython/ipython#13714
5+
6+
-------------------------------------------------------------------
7+
Thu Aug 4 10:24:27 UTC 2022 - Ben Greiner <code@bnavigator.de>
8+
9+
- Remove nbformat from the :test flavor. Run locally
10+
`--with localtests` for not skipping the tests.
11+
112
-------------------------------------------------------------------
213
Sat Jun 4 23:13:12 UTC 2022 - Arun Persaud <arun@gmx.de>
314

‎packages/p/python-ipython/python-ipython.spec‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424
%define psuffix %{nil}
2525
%bcond_with test
2626
%endif
27-
%{?!python_module:%define python_module() python3-%{**}}
28-
%define skip_python2 1
27+
# extra tests are skipped automatically, don't require these packages for Ring1
28+
%bcond_with localtest
29+
2930
%if 0%{?suse_version} > 1500
3031
%bcond_without libalternatives
3132
%else
3233
%bcond_with libalternatives
3334
%endif
35+
3436
Name: python-ipython%{psuffix}
3537
Version: 8.4.0
3638
Release: 0
@@ -40,6 +42,8 @@ Group: Development/Languages/Python
4042
URL: https://github.com/ipython/ipython
4143
Source: https://files.pythonhosted.org/packages/source/i/ipython/ipython-%{version}.tar.gz
4244
Source1: https://raw.githubusercontent.com/jupyter/qtconsole/4.0.0/qtconsole/resources/icon/JupyterConsole.svg
45+
# PATCH-FIX-UPSTREAM ipython-pr13714-xxlimited.patch gh#ipython/ipython#13714
46+
Patch0: ipython-pr13714-xxlimited.patch
4347
BuildRequires: %{python_module base >= 3.7}
4448
BuildRequires: %{python_module setuptools >= 18.5}
4549
BuildRequires: %{pythons}
@@ -83,7 +87,6 @@ BuildArch: noarch
8387
BuildRequires: %{python_module curio}
8488
BuildRequires: %{python_module ipython = %{version}}
8589
BuildRequires: %{python_module matplotlib}
86-
BuildRequires: %{python_module nbformat}
8790
BuildRequires: %{python_module numpy >= 1.19}
8891
BuildRequires: %{python_module pandas}
8992
BuildRequires: %{python_module pygments}
@@ -92,6 +95,9 @@ BuildRequires: %{python_module pytest}
9295
BuildRequires: %{python_module testpath}
9396
BuildRequires: %{python_module trio}
9497
%endif
98+
%if %{with localtest}
99+
BuildRequires: %{python_module nbformat}
100+
%endif
95101
%if !%{with test}
96102
BuildRequires: desktop-file-utils
97103
BuildRequires: hicolor-icon-theme

0 commit comments

Comments
 (0)