From 6ed9f7cfeb3cafd8ead3a218bccd000e65fcbc298969432291b5e9230838f1e8 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Mon, 26 Dec 2022 23:25:54 +0000 Subject: [PATCH] Accepting request 1045435 from home:bnavigator:branches:devel:languages:python:jupyter - Update to 6.5.2 * Ensure custom preload is correctly handled #6580 (@echarles) * Fix: jQuery-UI 404 Error by updating dependency path in static template #6578 (@RRosio) * Depend on nbclassic 0.4.7 #6593 (@echarles) - Drop upstreamed patch notebook-pr6578+pr6580-404errors.patch - Drop dependency on jupyter-nbformat, empty subpackage got removed OBS-URL: https://build.opensuse.org/request/show/1045435 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-notebook?expand=0&rev=54 --- notebook-6.5.1.tar.gz | 3 -- notebook-6.5.2.tar.gz | 3 ++ notebook-pr6578+pr6580-404errors.patch | 60 -------------------------- python-notebook.changes | 11 +++++ python-notebook.spec | 14 ++---- 5 files changed, 18 insertions(+), 73 deletions(-) delete mode 100644 notebook-6.5.1.tar.gz create mode 100644 notebook-6.5.2.tar.gz delete mode 100644 notebook-pr6578+pr6580-404errors.patch diff --git a/notebook-6.5.1.tar.gz b/notebook-6.5.1.tar.gz deleted file mode 100644 index dba80b5..0000000 --- a/notebook-6.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f69fd3b13df092af3a66c8797fa8ce00608db71cade89105ac4178b8d8d154aa -size 5716945 diff --git a/notebook-6.5.2.tar.gz b/notebook-6.5.2.tar.gz new file mode 100644 index 0000000..a19123b --- /dev/null +++ b/notebook-6.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1897e5317e225fc78b45549a6ab4b668e4c996fd03a04e938fe5e7af2bfffd0 +size 5717165 diff --git a/notebook-pr6578+pr6580-404errors.patch b/notebook-pr6578+pr6580-404errors.patch deleted file mode 100644 index 7a637ae..0000000 --- a/notebook-pr6578+pr6580-404errors.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f68d5198b006108c860d27918720fdf6a7ab48bd Mon Sep 17 00:00:00 2001 -From: RRosio -Date: Fri, 14 Oct 2022 09:13:31 -0700 -Subject: [PATCH] update dependency path in static template - ---- - notebook/templates/page.html | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/notebook/templates/page.html b/notebook/templates/page.html -index 2237319037..927694e937 100644 ---- a/notebook/templates/page.html -+++ b/notebook/templates/page.html -@@ -7,7 +7,7 @@ - {% block title %}Jupyter Notebook{% endblock %} - {% block favicon %}{% endblock %} - -- -+ - - - -@@ -39,7 +39,7 @@ - text: 'components/requirejs-text/text', - bootstrap: 'components/bootstrap/dist/js/bootstrap.min', - bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min', -- 'jquery-ui': 'components/jquery-ui/jquery-ui.min', -+ 'jquery-ui': 'components/jquery-ui/dist/jquery-ui.min', - moment: 'components/moment/min/moment-with-locales', - codemirror: 'components/codemirror', - termjs: 'components/xterm.js/xterm', - -From ab71610669e7548f2e9050f98da80cf1eba675ae Mon Sep 17 00:00:00 2001 -From: Eric Charles -Date: Sun, 16 Oct 2022 11:36:45 +0200 -Subject: [PATCH] Ensure custom preload is correctly handled - -diff --git a/notebook/templates/page.html b/notebook/templates/page.html -index 927694e937..fb5d642f4e 100644 ---- a/notebook/templates/page.html -+++ b/notebook/templates/page.html -@@ -98,6 +98,18 @@ - } - }) - -+ // error-catching custom-preload.js shim. -+ define("custom-preload", function (require, exports, module) { -+ try { -+ var custom = require('custom/custom-preload'); -+ console.debug('loaded custom-preload.js'); -+ return custom; -+ } catch (e) { -+ console.error("error loading custom-preload.js", e); -+ return {}; -+ } -+ }) -+ - document.nbjs_translations = {{ nbjs_translations|safe }}; - document.documentElement.lang = navigator.language.toLowerCase(); - diff --git a/python-notebook.changes b/python-notebook.changes index 2452445..d2526bc 100644 --- a/python-notebook.changes +++ b/python-notebook.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Dec 26 22:57:38 UTC 2022 - Ben Greiner + +- Update to 6.5.2 + * Ensure custom preload is correctly handled #6580 (@echarles) + * Fix: jQuery-UI 404 Error by updating dependency path in static + template #6578 (@RRosio) + * Depend on nbclassic 0.4.7 #6593 (@echarles) +- Drop upstreamed patch notebook-pr6578+pr6580-404errors.patch +- Drop dependency on jupyter-nbformat, empty subpackage got removed + ------------------------------------------------------------------- Thu Oct 27 15:11:59 UTC 2022 - Ben Greiner diff --git a/python-notebook.spec b/python-notebook.spec index 35a726d..f5d12e2 100644 --- a/python-notebook.spec +++ b/python-notebook.spec @@ -25,8 +25,7 @@ %bcond_with test BuildArch: noarch %endif -%{?!python_module:%define python_module() python3-%{**}} -%define skip_python2 1 + %define plainpython python # %if 0%{?suse_version} > 1500 @@ -35,7 +34,7 @@ BuildArch: noarch %bcond_with libalternatives %endif Name: python-notebook%{psuffix} -Version: 6.5.1 +Version: 6.5.2 Release: 0 Summary: Jupyter Notebook interface License: BSD-3-Clause @@ -43,8 +42,7 @@ Group: Development/Languages/Python URL: https://github.com/jupyter/notebook Source0: https://files.pythonhosted.org/packages/source/n/notebook/notebook-%{version}.tar.gz Source100: python-notebook-rpmlintrc -# PATCH-FIX-UPSTREAM notebook-pr6578+pr6580-404errors.patch gh#jupyter/notebook#6578 gh#jupyter/notebook#6580 -Patch1: notebook-pr6578+pr6580-404errors.patch +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module jupyter-packaging >= 0.9} BuildRequires: %{python_module nbclassic >= 0.4.0} BuildRequires: %{python_module setuptools} @@ -57,7 +55,7 @@ Requires: python-ipykernel Requires: python-ipython_genutils Requires: python-jupyter-client >= 5.3.4 Requires: python-jupyter-core >= 4.6.1 -Requires: python-nbclassic +Requires: python-nbclassic >= 0.4.7 Requires: python-nbconvert >= 5 Requires: python-nbformat Requires: python-prometheus_client @@ -124,7 +122,6 @@ Requires: jupyter-ipykernel Requires: jupyter-jupyter-client >= 5.3.4 Requires: jupyter-jupyter-core >= 4.6.1 Requires: jupyter-nbconvert -Requires: jupyter-nbformat Requires: jupyter-notebook-filesystem Requires: python3-notebook = %{version} Conflicts: python3-jupyter_notebook < 5.7.8 @@ -167,9 +164,6 @@ This package pulls in the LaTeX dependencies for the Jupyter Notebook. %prep %autosetup -p1 -n notebook-%{version} -# unpin nbclassic (see https://github.com/jupyter/notebook/pull/6593) -sed -i 's/nbclassic==/nbclassic>=/' setup.py - # We don't want to run selenium tests rm -rf notebook/tests/selenium