From 9b3df0ecf8f41789a872525127239d7d1cffc9b0d1363fd72698b5cc93c01360 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sat, 15 Jan 2022 17:13:21 +0000 Subject: [PATCH] Accepting request 946679 from home:bnavigator:branches:devel:languages:python:jupyter - Requires the full stdlib including sqlite3 - Revert some spec-cleaner edits OBS-URL: https://build.opensuse.org/request/show/946679 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-ipython?expand=0&rev=78 --- python-ipython.changes | 6 ++++++ python-ipython.spec | 20 +++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/python-ipython.changes b/python-ipython.changes index cd71d53..2ee4ad8 100644 --- a/python-ipython.changes +++ b/python-ipython.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jan 15 15:40:59 UTC 2022 - Ben Greiner + +- Requires the full stdlib including sqlite3 +- Revert some spec-cleaner edits + ------------------------------------------------------------------- Fri Jan 14 18:19:27 UTC 2022 - Matej Cepl diff --git a/python-ipython.spec b/python-ipython.spec index 7fd17fc..ec0013b 100644 --- a/python-ipython.spec +++ b/python-ipython.spec @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} > 1500 +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif + %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -24,15 +30,9 @@ %define psuffix %{nil} %bcond_with test %endif + %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -# Python 3.6 was officiallay supported with IPython up to 7.15 -%define skip_python36 1 -%if 0%{?suse_version} > 1500 -%bcond_without libalternatives -%else -%bcond_with libalternatives -%endif Name: python-ipython%{psuffix} Version: 8.0.0 Release: 0 @@ -49,15 +49,17 @@ Patch1: ipython-pr13371-py310-oserror.patch # PATCH-FIX-OPENSUSE skip-network-test.patch gh#ipython/ipython#13468 mcepl@suse.com # skip doctests requiring network connection Patch2: skip-network-test.patch +BuildRequires: %pythons BuildRequires: %{python_module backcall} BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module setuptools >= 18.5} BuildRequires: %{python_module stack-data} BuildRequires: fdupes BuildRequires: python-rpm-macros >= 20210929 +# requires the full stdlib including sqlite3 +Requires: python >= 3.7 Requires: python-Pygments Requires: python-backcall -Requires: python-base >= 3.7 Requires: python-decorator Requires: python-jedi >= 0.16 Requires: python-matplotlib-inline @@ -225,7 +227,7 @@ export PYTHONPATH=$(pwd) %if !%{with test} %pre # If libalternatives is used: Removing old update-alternatives entries. -%{python_libalternatives_reset_alternative} ipython +%python_libalternatives_reset_alternative ipython %post %python_install_alternative ipython ipython3 ipython.1.gz ipython3.1.gz