From 19afe372efde927b016b647356eb77ec5dbf7330 Mon Sep 17 00:00:00 2001 From: bnavigator <> Date: Wed, 23 Aug 2023 12:58:40 +0000 Subject: [PATCH] Update python-jupyter-sphinx to version 0.4.0 / rev 7 via SR 1105444 https://build.opensuse.org/request/show/1105444 by user bnavigator + anag+factory - Add ipykernel to requirements * jupyter-sphinx-pr226-ipykernel.patch * gh#jupyter/jupyter-sphinx#226 - PEP517 --- packages/p/python-jupyter-sphinx/.files | Bin 210 -> 284 bytes packages/p/python-jupyter-sphinx/.rev | 11 +++++ .../jupyter-sphinx-pr226-ipykernel.patch | 39 ++++++++++++++++++ .../python-jupyter-sphinx.changes | 8 ++++ .../python-jupyter-sphinx.spec | 23 +++++------ 5 files changed, 69 insertions(+), 12 deletions(-) create mode 100644 packages/p/python-jupyter-sphinx/jupyter-sphinx-pr226-ipykernel.patch diff --git a/packages/p/python-jupyter-sphinx/.files b/packages/p/python-jupyter-sphinx/.files index 1512e8d880a0bb3c0056b4262f1d6bd9f6ba92a4..e4851e553a75fa233db4e93c5b5ae20036e3bfe9 100644 GIT binary patch delta 167 zcmWN{OAdlC5CBm8ZSWE`aa%L}PP_Laoiap}kOnZ3OPH|tRGvuR`h7Q_?XgTV9O_+F zRr~dQ?Q0RWN~oYU$sk80pB)=)Em33-p#SrHf0kwDQBLL74KG%1st uREP>eMe~l#v?R)rcGkpFzhQJ9DM4Ba6q*Sm@}`ubK#)i*u+8=HwO@ZlZx}HE diff --git a/packages/p/python-jupyter-sphinx/.rev b/packages/p/python-jupyter-sphinx/.rev index dab5df4e063..d10bafff7a3 100644 --- a/packages/p/python-jupyter-sphinx/.rev +++ b/packages/p/python-jupyter-sphinx/.rev @@ -50,4 +50,15 @@ 988898 + + f9f9dd8723681ddd7bab45a9ad8e0edb + 0.4.0 + + anag+factory + - Add ipykernel to requirements + * jupyter-sphinx-pr226-ipykernel.patch + * gh#jupyter/jupyter-sphinx#226 +- PEP517 + 1105444 + diff --git a/packages/p/python-jupyter-sphinx/jupyter-sphinx-pr226-ipykernel.patch b/packages/p/python-jupyter-sphinx/jupyter-sphinx-pr226-ipykernel.patch new file mode 100644 index 00000000000..2771f323329 --- /dev/null +++ b/packages/p/python-jupyter-sphinx/jupyter-sphinx-pr226-ipykernel.patch @@ -0,0 +1,39 @@ +From ff54324169ccf92acf8ef511967a717628cad5a5 Mon Sep 17 00:00:00 2001 +From: Jim Garrison +Date: Tue, 1 Aug 2023 14:17:51 -0400 +Subject: [PATCH] Add direct dependency on ipykernel + +ipywidgets 8.1.0 has been released, which includes the change at +https://github.com/jupyter-widgets/ipywidgets/pull/3811. +With this change, ipykernel is no longer a dependnecy of ipywidgets, +so jupyer-sphinx must now depend on ipykernel directly rather +than assume it will be installed as a transitive dependency of +ipywidgets. Without this change, jupyter-sphinx tests will fail CI. +This has additionally led to CI failures in some packages that +depend on jupyter-sphinx but not ipykernel. +--- + requirements.txt | 1 + + 1 file changed, 1 insertion(+) + +Index: jupyter-sphinx-0.4.0/requirements.txt +=================================================================== +--- jupyter-sphinx-0.4.0.orig/requirements.txt ++++ jupyter-sphinx-0.4.0/requirements.txt +@@ -1,4 +1,5 @@ + sphinx>=2.4.4 ++ipykernel>=4.5.1 + ipywidgets>=7.0.0 + IPython + nbconvert>=5.4 +Index: jupyter-sphinx-0.4.0/setup.py +=================================================================== +--- jupyter-sphinx-0.4.0.orig/setup.py ++++ jupyter-sphinx-0.4.0/setup.py +@@ -30,6 +30,7 @@ setup( + packages=["jupyter_sphinx"], + install_requires=[ + "Sphinx>=2", ++ "ipykernel>=4.5.1", + "ipywidgets>=7.0.0", + "IPython", + "nbconvert>=5.5", diff --git a/packages/p/python-jupyter-sphinx/python-jupyter-sphinx.changes b/packages/p/python-jupyter-sphinx/python-jupyter-sphinx.changes index 4ea00e6d843..d499c88ce74 100644 --- a/packages/p/python-jupyter-sphinx/python-jupyter-sphinx.changes +++ b/packages/p/python-jupyter-sphinx/python-jupyter-sphinx.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 23 08:50:53 UTC 2023 - Ben Greiner + +- Add ipykernel to requirements + * jupyter-sphinx-pr226-ipykernel.patch + * gh#jupyter/jupyter-sphinx#226 +- PEP517 + ------------------------------------------------------------------- Wed Jul 13 00:34:46 UTC 2022 - Arun Persaud diff --git a/packages/p/python-jupyter-sphinx/python-jupyter-sphinx.spec b/packages/p/python-jupyter-sphinx/python-jupyter-sphinx.spec index f2e51a78081..b8cc5b7acc4 100644 --- a/packages/p/python-jupyter-sphinx/python-jupyter-sphinx.spec +++ b/packages/p/python-jupyter-sphinx/python-jupyter-sphinx.spec @@ -1,7 +1,7 @@ # # spec file for package python-jupyter-sphinx # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 -%define oldpython python Name: python-jupyter-sphinx Version: 0.4.0 Release: 0 @@ -26,11 +23,16 @@ Summary: Jupyter Sphinx Extensions License: BSD-3-Clause URL: https://github.com/jupyter-widgets/jupyter-sphinx Source: https://github.com/jupyter/jupyter-sphinx/archive/v%{version}.tar.gz#/jupyter-sphinx-%{version}-gh.tar.gz +# PATCH-FIX-UPSTREAM jupyter-sphinx-pr226-ipykernel.patch gh#upyter-widgets/jupyter-sphinx#226 +Patch0: jupyter-sphinx-pr226-ipykernel.patch +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-IPython Requires: python-Sphinx >= 2 +Requires: python-ipykernel >= 4.5.1 Requires: python-ipywidgets >= 7.0.0 Requires: python-nbconvert >= 5.5 Requires: python-nbformat @@ -41,6 +43,7 @@ BuildArch: noarch BuildRequires: %{python_module IPython} BuildRequires: %{python_module Sphinx >= 2} BuildRequires: %{python_module Sphinx-latex} +BuildRequires: %{python_module ipykernel >= 4.5.1} BuildRequires: %{python_module ipywidgets >= 7.0.0} BuildRequires: %{python_module nbconvert >= 5.5} BuildRequires: %{python_module nbformat} @@ -49,23 +52,19 @@ BuildRequires: %{python_module pytest} %if "%{python_flavor}" == "python3" || "%{?python_provides}" == "python3" Provides: jupyter-jupyter-sphinx = %{version} %endif -%ifpython2 -Provides: %{oldpython}-jupyter_sphinx = %{version} -Obsoletes: %{oldpython}-jupyter_sphinx < %{version} -%endif %python_subpackages %description Jupyter Sphinx extensions enable jupyter-specific features in sphinx. %prep -%setup -q -n jupyter-sphinx-%{version} +%autosetup -p1 -n jupyter-sphinx-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -74,7 +73,7 @@ Jupyter Sphinx extensions enable jupyter-specific features in sphinx. %files %{python_files} %doc README.md %license LICENSE -%{python_sitelib}/jupyter_sphinx-%{version}-py*.egg-info +%{python_sitelib}/jupyter_sphinx-%{version}.dist-info %{python_sitelib}/jupyter_sphinx/ %changelog