From 54cafe48ef0b39a6e99c385b9fe76d9a706f3db5dc68ec6fca189b32d128b806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 3 Feb 2021 12:38:07 +0000 Subject: [PATCH] Accepting request 868775 from home:bnavigator:branches:devel:languages:python:jupyter - Update to version 1.2.3 * for the full changelog between 0.2.1 and 1.2.3 see https://github.com/jupyter-server/jupyter_server/blob/master/CHANGELOG.md * 1.0.6: Fix open redirect vulnerability GHSA-grfj-wjv9-4f9v (CVE-2020-26232) * 1.0: Added new extension manager API for handling server extensions * 1.0: Dropped support for Python 3.5. (296) * 1.0: Removed ipykernel as a dependency of jupyter_server. * 0.3: (#194) The bundlerextension entry point was removed. - Merge the jupyter-jupyter_server package into the python packages using update-alternatives. It contained only the script entrypoints. - Fix testsuite by providing the correct entrypoints in PATH OBS-URL: https://build.opensuse.org/request/show/868775 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-jupyter-server?expand=0&rev=20 --- jupyter_server-0.2.1.tar.gz | 3 - jupyter_server-1.2.3.tar.gz | 3 + python-jupyter-server.changes | 18 ++++++ python-jupyter-server.spec | 106 +++++++++++++++------------------- 4 files changed, 69 insertions(+), 61 deletions(-) delete mode 100644 jupyter_server-0.2.1.tar.gz create mode 100644 jupyter_server-1.2.3.tar.gz diff --git a/jupyter_server-0.2.1.tar.gz b/jupyter_server-0.2.1.tar.gz deleted file mode 100644 index 5721b6f..0000000 --- a/jupyter_server-0.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d14df9d599744dfa043d96a8383ce9198374db727b9227286a04a122039d2737 -size 673457 diff --git a/jupyter_server-1.2.3.tar.gz b/jupyter_server-1.2.3.tar.gz new file mode 100644 index 0000000..eeb72b7 --- /dev/null +++ b/jupyter_server-1.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86fe55308d77996ce4b1f780043c09c5776a76be7f25daf1a3e3d540389e8ef3 +size 268319 diff --git a/python-jupyter-server.changes b/python-jupyter-server.changes index 43d65a7..5b618ab 100644 --- a/python-jupyter-server.changes +++ b/python-jupyter-server.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Feb 1 22:48:25 UTC 2021 - Ben Greiner + +- Update to version 1.2.3 + * for the full changelog between 0.2.1 and 1.2.3 see + https://github.com/jupyter-server/jupyter_server/blob/master/CHANGELOG.md + * 1.0.6: Fix open redirect vulnerability GHSA-grfj-wjv9-4f9v + (CVE-2020-26232) + * 1.0: Added new extension manager API for handling server + extensions + * 1.0: Dropped support for Python 3.5. (296) + * 1.0: Removed ipykernel as a dependency of jupyter_server. + * 0.3: (#194) The bundlerextension entry point was removed. +- Merge the jupyter-jupyter_server package into the python + packages using update-alternatives. It contained only the script + entrypoints. +- Fix testsuite by providing the correct entrypoints in PATH + ------------------------------------------------------------------- Tue Jun 9 07:13:34 UTC 2020 - Tomáš Chvátal diff --git a/python-jupyter-server.spec b/python-jupyter-server.spec index 4775443..19aba0e 100644 --- a/python-jupyter-server.spec +++ b/python-jupyter-server.spec @@ -1,7 +1,7 @@ # # spec file for package python-jupyter-server # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,58 +19,60 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-jupyter-server -Version: 0.2.1 +Version: 1.2.3 Release: 0 Summary: The Jupyter Server License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/jupyter/jupyter_server Source: https://github.com/jupyter/jupyter_server/archive/%{version}.tar.gz#/jupyter_server-%{version}.tar.gz -BuildRequires: %{python_module setuptools} -BuildRequires: fdupes -BuildRequires: python-rpm-macros -# SECTION test requirements +# We need the full stdlib +BuildRequires: %pythons BuildRequires: %{python_module Jinja2} BuildRequires: %{python_module Send2Trash} -BuildRequires: %{python_module coverage} -BuildRequires: %{python_module ipykernel} +BuildRequires: %{python_module anyio >= 2.0.2} BuildRequires: %{python_module ipython_genutils} -BuildRequires: %{python_module jupyter-client >= 5.2.0} +BuildRequires: %{python_module jupyter-client >= 6.1.1} BuildRequires: %{python_module jupyter-core >= 4.4.0} BuildRequires: %{python_module nbconvert} BuildRequires: %{python_module nbformat} -BuildRequires: %{python_module nbval} -BuildRequires: %{python_module nose} BuildRequires: %{python_module prometheus_client} -BuildRequires: %{python_module pytest-console-scripts} -BuildRequires: %{python_module pytest-tornasync} -BuildRequires: %{python_module pytest} BuildRequires: %{python_module pyzmq >= 17} -BuildRequires: %{python_module requests} -BuildRequires: %{python_module terminado >= 0.8.1} -BuildRequires: %{python_module tornado >= 4} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module terminado >= 0.8.3} +BuildRequires: %{python_module tornado >= 6.1} BuildRequires: %{python_module traitlets >= 4.2.1} -BuildRequires: pandoc -# /SECTION -Requires: jupyter-jupyter-server = %{version} +BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-Jinja2 Requires: python-Send2Trash -Requires: python-ipykernel +Requires: python-anyio Requires: python-ipython_genutils -Requires: python-jupyter-client >= 5.2.0 +Requires: python-jupyter-client >= 6.1.1 Requires: python-jupyter-core >= 4.4.0 Requires: python-nbconvert Requires: python-nbformat Requires: python-prometheus_client Requires: python-pyzmq >= 17 -Requires: python-terminado >= 0.8.1 -Requires: python-tornado >= 4 +Requires: python-terminado >= 0.8.3 +Requires: python-tornado >= 6.1 Requires: python-traitlets >= 4.2.1 -%ifpython2 -Requires: python-ipaddress -%endif +Requires(post): update-alternatives +Requires(postun): update-alternatives +# SECTION extras_require test +BuildRequires: %{python_module ipykernel} +BuildRequires: %{python_module pytest-console-scripts} +BuildRequires: %{python_module pytest-tornasync} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module requests} +# /SECTION +Provides: python-jupyter_server = %{version}-%{release} +Obsoletes: python-jupyter_server < %{version}-%{release} +%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" +Provides: jupyter-jupyter-server = %{version}-%{release} +Obsoletes: jupyter-jupyter-server < %{version}-%{release} BuildArch: noarch - +%endif %python_subpackages %description @@ -79,26 +81,6 @@ share documents that contain live code, equations, visualizations, and explanatory text. The Notebook has support for multiple programming languages, sharing, and interactive widgets. -This package provides the python interface. - -%package -n jupyter-jupyter-server -Summary: The Jupyter Server -Group: Development/Languages/Python -Requires: jupyter-ipykernel -Requires: jupyter-jupyter-client >= 5.2.0 -Requires: jupyter-jupyter-core >= 4.4.0 -Requires: jupyter-nbconvert -Requires: jupyter-nbformat -Requires: python3-jupyter-server = %{version} - -%description -n jupyter-jupyter-server -The Jupyter Server is a web application that allows you to create and -share documents that contain live code, equations, visualizations, and -explanatory text. The Notebook has support for multiple programming -languages, sharing, and interactive widgets. - -This package provides the jupyter components. - %prep %setup -q -n jupyter_server-%{version} @@ -107,24 +89,32 @@ This package provides the jupyter components. %install %python_install +%python_clone -a %{buildroot}%{_bindir}/jupyter-server %python_expand %fdupes %{buildroot}%{$python_sitelib} -# Avoid conflict with jupyter-notebook -mv %{buildroot}%{_bindir}/jupyter-bundlerextension %{buildroot}%{_bindir}/jupyter-server-bundlerextension - %check +%{python_expand # provide u-a entrypoints in the correct flavor version -- installed packages and jupyter-server +mkdir build/testbin +for bin in %{_bindir}/*-%{$python_bin_suffix} %{buildroot}%{_bindir}/*-%{$python_bin_suffix} ; do + # four percent into 1 by rpm/python expansions + ln -s ${bin} build/testbin/$(basename ${bin%%%%-%{$python_bin_suffix}}) +done +} export LANG=en_US.UTF-8 -export PATH=$PATH:%{buildroot}%{_bindir} +export PATH=$PWD/build/testbin:$PATH %pytest tests +%post +%python_install_alternative jupyter-server + +%postun +%python_uninstall_alternative jupyter-server + %files %{python_files} %doc README.md %license COPYING.md -%{python_sitelib}/* - -%files -n jupyter-jupyter-server -%license COPYING.md -%{_bindir}/jupyter-server -%{_bindir}/jupyter-server-bundlerextension +%python_alternative %{_bindir}/jupyter-server +%{python_sitelib}/jupyter_server +%{python_sitelib}/jupyter_server-%{version}*-info %changelog