Skip to content

Commit

Permalink
Update python-jupyter-sphinx to version 0.4.0 / rev 7 via SR 1105444
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bnavigator authored and bmwiedemann committed Aug 23, 2023
1 parent 1a142fd commit 19afe37
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 12 deletions.
Binary file modified packages/p/python-jupyter-sphinx/.files
Binary file not shown.
11 changes: 11 additions & 0 deletions packages/p/python-jupyter-sphinx/.rev
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,15 @@
<comment></comment>
<requestid>988898</requestid>
</revision>
<revision rev="7" vrev="2">
<srcmd5>f9f9dd8723681ddd7bab45a9ad8e0edb</srcmd5>
<version>0.4.0</version>
<time>1692795519</time>
<user>anag+factory</user>
<comment>- Add ipykernel to requirements
* jupyter-sphinx-pr226-ipykernel.patch
* gh#jupyter/jupyter-sphinx#226
- PEP517</comment>
<requestid>1105444</requestid>
</revision>
</revisionlist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From ff54324169ccf92acf8ef511967a717628cad5a5 Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
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",
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Aug 23 08:50:53 UTC 2023 - Ben Greiner <code@bnavigator.de>

- 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 <arun@gmx.de>

Expand Down
23 changes: 11 additions & 12 deletions packages/p/python-jupyter-sphinx/python-jupyter-sphinx.spec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,21 +16,23 @@
#


%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
%define oldpython python
Name: python-jupyter-sphinx
Version: 0.4.0
Release: 0
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
Expand All @@ -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}
Expand All @@ -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
Expand All @@ -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

0 comments on commit 19afe37

Please sign in to comment.