From a0aa0ee897662002229d6068ce1596bc5e207c1a065a16d6dbf23b4f7e7d2b59 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 14 Nov 2021 17:41:44 +0000 Subject: [PATCH 1/2] Accepting request 931413 from home:bnavigator:branches:devel:languages:python:jupyter - Update to 0.3.4 * Monkeypatch IPythonHandler to find nbclassic's jinja templates #77 (@Zsailer) * Run JupyterLab browser tests as downstream tests #76 (@Zsailer) * add check-release workflow #75 (@Zsailer) - Release 0.3.3 * Use Jupyter Packaging and other cleanup #68 (@Zsailer) * add missing lines to manifest #72 (@Zsailer) * add changelog comments for jupyter-releaser #70 (@Zsailer) * add setup.py back to enable jupyter_releaser #69 (@Zsailer) * Add workflow to test JupyterLab #67 (@Zsailer) * Expose classic notebook's static assets from their original endpoints #63 (@Zsailer) - Release 0.32.2 * ExtensionManager's link_extension changed call signature #64 (@athornton) * Fix link to the Jupyter Notebook repo in README #62 (@saiwing-yeung) - Reenable libalternatives OBS-URL: https://build.opensuse.org/request/show/931413 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbclassic?expand=0&rev=7 --- nbclassic-0.3.1-gh.tar.gz | 3 --- nbclassic-0.3.4-gh.tar.gz | 3 +++ python-nbclassic.changes | 23 +++++++++++++++++++++++ python-nbclassic.spec | 24 +++++++++++------------- 4 files changed, 37 insertions(+), 16 deletions(-) delete mode 100644 nbclassic-0.3.1-gh.tar.gz create mode 100644 nbclassic-0.3.4-gh.tar.gz diff --git a/nbclassic-0.3.1-gh.tar.gz b/nbclassic-0.3.1-gh.tar.gz deleted file mode 100644 index 56d624d..0000000 --- a/nbclassic-0.3.1-gh.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:315e6aff889e08155d9f8a9200b7f8e399708c3d0644a5f4aed4a20762a2c0a1 -size 25761 diff --git a/nbclassic-0.3.4-gh.tar.gz b/nbclassic-0.3.4-gh.tar.gz new file mode 100644 index 0000000..80da44c --- /dev/null +++ b/nbclassic-0.3.4-gh.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08a22ed9c09341dc00e30b73130533e7a0325ce409bf137bd24dfa048d4881b9 +size 22308 diff --git a/python-nbclassic.changes b/python-nbclassic.changes index 49dd65e..fef38ae 100644 --- a/python-nbclassic.changes +++ b/python-nbclassic.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sun Nov 14 15:53:25 UTC 2021 - Ben Greiner + +- Update to 0.3.4 + * Monkeypatch IPythonHandler to find nbclassic's jinja templates + #77 (@Zsailer) + * Run JupyterLab browser tests as downstream tests #76 (@Zsailer) + * add check-release workflow #75 (@Zsailer) +- Release 0.3.3 + * Use Jupyter Packaging and other cleanup #68 (@Zsailer) + * add missing lines to manifest #72 (@Zsailer) + * add changelog comments for jupyter-releaser #70 (@Zsailer) + * add setup.py back to enable jupyter_releaser #69 (@Zsailer) + * Add workflow to test JupyterLab #67 (@Zsailer) + * Expose classic notebook's static assets from their original + endpoints #63 (@Zsailer) +- Release 0.32.2 + * ExtensionManager's link_extension changed call signature #64 + (@athornton) + * Fix link to the Jupyter Notebook repo in README #62 + (@saiwing-yeung) +- Reenable libalternatives + ------------------------------------------------------------------- Thu Oct 28 19:14:07 UTC 2021 - Ben Greiner diff --git a/python-nbclassic.spec b/python-nbclassic.spec index 26d4ab1..44bd8ed 100644 --- a/python-nbclassic.spec +++ b/python-nbclassic.spec @@ -16,8 +16,7 @@ # -%bcond_with libalternatives_issue_11_fixed -%if 0%{?suse_version} > 1500 && %{with libalternatives_issue_11_fixed} +%if 0%{?suse_version} > 1500 %bcond_without libalternatives %else %bcond_with libalternatives @@ -26,21 +25,21 @@ %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-nbclassic -Version: 0.3.1 +Version: 0.3.4 Release: 0 Summary: Jupyter Notebook as a Jupyter Server Extension License: BSD-3-Clause URL: https://github.com/jupyterlab/nbclassic # The github archive has the tests -Source: https://github.com/jupyterlab/nbclassic/archive/%{version}.tar.gz#/nbclassic-%{version}-gh.tar.gz -BuildRequires: %{python_module jupyter_server >= 1.8} -BuildRequires: %{python_module notebook} +Source: https://github.com/jupyterlab/nbclassic/archive/v%{version}.tar.gz#/nbclassic-%{version}-gh.tar.gz +BuildRequires: %{python_module jupyter_server >= 1.8 with %python-jupyter_server < 2} +BuildRequires: %{python_module notebook < 7} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros >= 20210929 Requires: jupyter-nbclassic = %{version} -Requires: python-jupyter_server >= 1.8 -Requires: python-notebook +Requires: python-notebook < 7 +Requires: (python-jupyter_server >= 1.8 with python-jupyter_server < 2) %if %{with libalternatives} Requires: alts BuildRequires: alts @@ -85,9 +84,9 @@ This package contains the jupyterlab server configuration file %install %python_install -install -m 644 -D -t %{buildroot}%{_jupyter_server_confdir} jupyter_server_config.d/* %python_clone -a %{buildroot}%{_bindir}/jupyter-nbclassic %python_expand %fdupes %{buildroot}%{$python_sitelib} +%jupyter_move_config %pre # If libalternatives is used: Removing old update-alternatives entries. @@ -100,15 +99,14 @@ install -m 644 -D -t %{buildroot}%{_jupyter_server_confdir} jupyter_server_confi %python_uninstall_alternative jupyter-nbclassic %check -# suppress color output -rm setup.cfg -%pytest -s +%pytest nbclassic %files %{python_files} %doc README.md %license LICENSE %python_alternative %{_bindir}/jupyter-nbclassic -%{python_sitelib}/ +%{python_sitelib}/nbclassic +%{python_sitelib}/nbclassic-%{version}*-info %files -n jupyter-nbclassic %license LICENSE From d289dbcb9594e8d3c65a4f15f80a2d41cf935599f03541e05c10931945940627 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 21 Nov 2021 09:18:25 +0000 Subject: [PATCH 2/2] - Accomodate moved config to distconfig OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbclassic?expand=0&rev=8 --- python-nbclassic.changes | 5 +++++ python-nbclassic.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-nbclassic.changes b/python-nbclassic.changes index fef38ae..938c5e9 100644 --- a/python-nbclassic.changes +++ b/python-nbclassic.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 21 09:15:13 UTC 2021 - Ben Greiner + +- Accomodate moved config to distconfig + ------------------------------------------------------------------- Sun Nov 14 15:53:25 UTC 2021 - Ben Greiner diff --git a/python-nbclassic.spec b/python-nbclassic.spec index 44bd8ed..661ca99 100644 --- a/python-nbclassic.spec +++ b/python-nbclassic.spec @@ -110,6 +110,6 @@ This package contains the jupyterlab server configuration file %files -n jupyter-nbclassic %license LICENSE -%config %{_jupyter_server_confdir}/nbclassic.json +%{!?_jupyter_distconfig:%config} %{_jupyter_server_confdir}/nbclassic.json %changelog