From 1566a918c73af1e35479319548dbbdae6932330c592abddd05f17db49bd5ef22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 27 Jul 2021 08:48:16 +0000 Subject: [PATCH 1/2] Accepting request 908012 from home:bnavigator:branches:devel:languages:python:jupyter - Update to version 6.0.3 * KernelApp: rename ports variable to avoid override #731 (@amorenoz) - Release version 6.0.2 * Add watchfd keyword to InProcessKernel OutStream initialization #727 (@rayosborn) * Fix typo in eventloops.py #711 (@selasley) * [bugfix] fix in setup.py (comma before appnope) #709 (@jstriebel) * Add upper bound to dependency versions. #714 (@martinRenou) * Replace non-existing function. #723 (@Carreau) * Remove unused variables #722 (@Carreau) * Do not use bare except #721 (@Carreau) * misc whitespace and line too long #720 (@Carreau) * Formatting: remove semicolon #719 (@Carreau) * Clean most flake8 unused import warnings. #718 (@Carreau) * Minimal flake8 config #717 (@Carreau) * Remove CachingCompiler's filename_mapper #710 (@martinRenou) - Release version 6.0.1 * Fix Tk and asyncio event loops #704 (@ccordoba12) * Stringify variables that are not json serializable in inspectVariable #702 (@JohanMabille) - Install kernelspecs for each flavor. Remove common jupyter-ipykernel package - Update to version 6.0.0 IPykernel 6.0 is the first major release in about two years, that brings a number of improvements, code cleanup, and new features to IPython. IPykernel 6 should contain all changes of the 5.x series, in addition to the following non-exhaustive changes: * Support for the debugger protocol, when using JupyterLab, RetroLab or any frontend supporting the debugger protocol you should have access to the debugger functionalities. * The control channel on IPykernel 6.0 is run in a separate thread, this max change the order in which messages are processed, though this change was necessary to accommodate the debugger. * We now have a new dependency: matplotlib-inline, this helps to separate the circular dependency between IPython/IPykernel and matplotlib. * All outputs to stdout/stderr should now be captured, including subprocesses and output of compiled libraries (blas, lapack....). In notebook server, some outputs that would previously go to the notebooks logs will now both head to notebook logs and in notebooks outputs. In terminal frontend like Jupyter Console, Emacs or other, this may ends up as duplicated outputs. * coroutines are now native (async-def) , instead of using tornado's @gen.coroutine * OutStreams can now be configured to report istty() == True, while this should make some output nicer (for example colored), it is likely to break others. Use with care. Deprecations in 6.0 * Kernels now support only a single shell stream, multiple streams will now be ignored. The attribute * Kernel.shell_streams (plural) is deprecated in ipykernel 6.0. Use Kernel.shell_stream (singular) * Kernel._parent_header is deprecated, even though it was private. Use .get_parent() now. Removal in 6.0 * ipykernel.codeutils was deprecated since 4.x series (2016) and has been removed, please import similar functionalities from ipyparallel * remove find_connection_file and profile argument of connect_qtconsole and get_connection_info, deprecated since IPykernel 4.2.2 (2016). OBS-URL: https://build.opensuse.org/request/show/908012 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-ipykernel?expand=0&rev=34 --- ipykernel-5.5.5.tar.gz | 3 -- ipykernel-6.0.3.tar.gz | 3 ++ python-ipykernel.changes | 74 ++++++++++++++++++++++++++++++++++++++++ python-ipykernel.spec | 69 +++++++++++++++++++++---------------- 4 files changed, 116 insertions(+), 33 deletions(-) delete mode 100644 ipykernel-5.5.5.tar.gz create mode 100644 ipykernel-6.0.3.tar.gz diff --git a/ipykernel-5.5.5.tar.gz b/ipykernel-5.5.5.tar.gz deleted file mode 100644 index 38f48ac..0000000 --- a/ipykernel-5.5.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e976751336b51082a89fc2099fb7f96ef20f535837c398df6eab1283c2070884 -size 112909 diff --git a/ipykernel-6.0.3.tar.gz b/ipykernel-6.0.3.tar.gz new file mode 100644 index 0000000..62de4a5 --- /dev/null +++ b/ipykernel-6.0.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0df34a78c7e1422800d6078cde65ccdcdb859597046c338c759db4dbc535c58f +size 109495 diff --git a/python-ipykernel.changes b/python-ipykernel.changes index 6b9bea6..52dbd28 100644 --- a/python-ipykernel.changes +++ b/python-ipykernel.changes @@ -1,3 +1,77 @@ +------------------------------------------------------------------- +Fri Jul 23 08:22:28 UTC 2021 - Ben Greiner + +- Update to version 6.0.3 + * KernelApp: rename ports variable to avoid override #731 + (@amorenoz) +- Release version 6.0.2 + * Add watchfd keyword to InProcessKernel OutStream initialization + #727 (@rayosborn) + * Fix typo in eventloops.py #711 (@selasley) + * [bugfix] fix in setup.py (comma before appnope) #709 + (@jstriebel) + * Add upper bound to dependency versions. #714 (@martinRenou) + * Replace non-existing function. #723 (@Carreau) + * Remove unused variables #722 (@Carreau) + * Do not use bare except #721 (@Carreau) + * misc whitespace and line too long #720 (@Carreau) + * Formatting: remove semicolon #719 (@Carreau) + * Clean most flake8 unused import warnings. #718 (@Carreau) + * Minimal flake8 config #717 (@Carreau) + * Remove CachingCompiler's filename_mapper #710 (@martinRenou) +- Release version 6.0.1 + * Fix Tk and asyncio event loops #704 (@ccordoba12) + * Stringify variables that are not json serializable in + inspectVariable #702 (@JohanMabille) +- Install kernelspecs for each flavor. Remove common + jupyter-ipykernel package + +------------------------------------------------------------------- +Thu Jul 1 17:17:26 UTC 2021 - Ben Greiner + +- Update to version 6.0.0 + IPykernel 6.0 is the first major release in about two years, + that brings a number of improvements, code cleanup, and new + features to IPython. + IPykernel 6 should contain all changes of the 5.x series, in + addition to the following non-exhaustive changes: + * Support for the debugger protocol, when using JupyterLab, + RetroLab or any frontend supporting the debugger protocol you + should have access to the debugger functionalities. + * The control channel on IPykernel 6.0 is run in a separate + thread, this max change the order in which messages are + processed, though this change was necessary to accommodate + the debugger. + * We now have a new dependency: matplotlib-inline, this helps + to separate the circular dependency between IPython/IPykernel + and matplotlib. + * All outputs to stdout/stderr should now be captured, + including subprocesses and output of compiled libraries + (blas, lapack....). In notebook server, some outputs that + would previously go to the notebooks logs will now + both head to notebook logs and in notebooks outputs. In + terminal frontend like Jupyter Console, Emacs or other, this + may ends up as duplicated outputs. + * coroutines are now native (async-def) , instead of using + tornado's @gen.coroutine + * OutStreams can now be configured to report istty() == True, + while this should make some output nicer (for example colored), + it is likely to break others. Use with care. + Deprecations in 6.0 + * Kernels now support only a single shell stream, multiple + streams will now be ignored. The attribute + * Kernel.shell_streams (plural) is deprecated in ipykernel 6.0. + Use Kernel.shell_stream (singular) + * Kernel._parent_header is deprecated, even though it was + private. Use .get_parent() now. + Removal in 6.0 + * ipykernel.codeutils was deprecated since 4.x series (2016) and + has been removed, please import similar functionalities from + ipyparallel + * remove find_connection_file and profile argument of + connect_qtconsole and get_connection_info, deprecated since + IPykernel 4.2.2 (2016). + ------------------------------------------------------------------- Fri Jun 25 12:08:31 UTC 2021 - Ben Greiner diff --git a/python-ipykernel.spec b/python-ipykernel.spec index ed61809..e2509ef 100644 --- a/python-ipykernel.spec +++ b/python-ipykernel.spec @@ -18,25 +18,32 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 +%define skip_python36 1 Name: python-ipykernel -Version: 5.5.5 +Version: 6.0.3 Release: 0 Summary: IPython Kernel for Jupyter License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/ipython/ipykernel Source: https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-%{version}.tar.gz +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: jupyter-jupyter_core-filesystem BuildRequires: python-rpm-macros -Requires: jupyter-ipykernel = %{version} -Requires: python-ipython >= 5.0.0 +Requires: hicolor-icon-theme +Requires: jupyter-jupyter-client +Requires: python-debugpy >= 1.0 +Requires: python-ipython >= 7.23.1 Requires: python-jupyter-client Requires: python-jupyter-core Requires: python-tornado >= 4.2 Requires: python-traitlets >= 4.1.0 +%if 0%{?python_version_nodots} < 38 +Requires: python-importlib-metadata +%endif Provides: python-jupyter_ipykernel = %{version} Obsoletes: python-jupyter_ipykernel < %{version} Provides: %{python_module ipykernel-doc = %{version}} @@ -45,19 +52,25 @@ Provides: %{python_module jupyter_ipykernel-doc = %{version}} Obsoletes: %{python_module jupyter_ipykernel-doc < %{version}} Provides: %{python_module jupyter-ipykernel-doc = %{version}} Obsoletes: %{python_module jupyter-ipykernel-doc < %{version}} +%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" +Provides: jupyter-ipykernel = %{version}-%{release} +Obsoletes: jupyter-ipykernel < %{version}-%{release} +%endif BuildArch: noarch # SECTION test requirements +BuildRequires: %{python_module importlib-metadata if %python-base < 3.8} +BuildRequires: %{python_module debugpy >= 1.0.0} BuildRequires: %{python_module flaky} -BuildRequires: %{python_module ipython >= 5.0.0} +BuildRequires: %{python_module ipyparallel} +BuildRequires: %{python_module ipython >= 7.23.1} BuildRequires: %{python_module jupyter-client} BuildRequires: %{python_module jupyter-core} +BuildRequires: %{python_module matplotlib-inline >= 0.1} BuildRequires: %{python_module nose_warnings_filters} BuildRequires: %{python_module nose} BuildRequires: %{python_module pytest} BuildRequires: %{python_module tornado >= 4.2} BuildRequires: %{python_module traitlets >= 4.1.0} -BuildRequires: %{python_module matplotlib if (%python-base without python36-base)} -BuildRequires: %{python_module numpy if (%python-base without python36-base)} # /SECTION # typing is only built-in for later versions of python %if 0%{?suse_version} <= 1320 @@ -69,21 +82,6 @@ Requires: python-typing %description This package provides the IPython kernel for Jupyter. -This package provides the python interface. - -%package -n jupyter-ipykernel -Summary: IPython Kernel for Jupyter -Group: Development/Languages/Python -Requires: hicolor-icon-theme -Requires: jupyter-jupyter-client -Requires: python3-ipykernel = %{version} -Conflicts: python3-jupyter_ipykernel < 5.1.1 - -%description -n jupyter-ipykernel -This package provides the IPython kernel for Jupyter. - -This package provides the jupyter components. - %prep %autosetup -p1 -n ipykernel-%{version} @@ -92,23 +90,34 @@ This package provides the jupyter components. %install %python_install +%if %suse_version >= 1550 +%{python_expand # install kernelspecs for each flavor +PYTHONPATH=%{buildroot}%{$python_sitelib} +$python -m ipykernel install \ + --prefix=%{buildroot}%{_prefix} \ + --name python%{$python_bin_suffix} \ + --display-name 'Python %{$python_bin_suffix} (ipykernel)' +} +# use the symlink for the default python3 flavor +sed -i "s|$(readlink -f %{__python3})|%{__python3}|" %{buildroot}%{_jupyter_kernel_dir}/python3/kernel.json +%endif %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# These tests expect jedi 0.17.2 return messages, but we use patches to support jedi 0.18 in ipython715 -# and ipython 7.20 fixed its support for jedi 0.18 gh#ipython/ipykernel#578 gh#ipython/ipykernel#579 -%pytest -ra -k "not (test_complete or test_inspect)" +%pytest -ra %files %{python_files} -%doc README.md docs/changelog.rst +%doc README.md %license COPYING.md %{python_sitelib}/ipykernel %{python_sitelib}/ipykernel_launcher.py %{python_sitelib}/ipykernel-%{version}-py*.egg-info -%pycache_only %{python_sitelib}/__pycache__ - -%files -n jupyter-ipykernel -%license COPYING.md -%{_jupyter_kernel_dir}/python3/ +%pycache_only %{python_sitelib}/__pycache__/*.pyc +%if %suse_version >= 1550 +%{_jupyter_kernel_dir}/python%{python_bin_suffix} +%endif +%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" +%{_jupyter_kernel_dir}/python3 +%endif %changelog From acddd03fa8b8a5713ee1aceb90ad06d62361e0780bbe3dfbf5b0df629648cb61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 5 Aug 2021 08:13:03 +0000 Subject: [PATCH 2/2] Accepting request 910266 from home:mcalabkova:branches:devel:languages:python:jupyter - Skip pickle tests to get rid of ipyparallel dependency which we don't want in Ring1 stagings OBS-URL: https://build.opensuse.org/request/show/910266 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-ipykernel?expand=0&rev=35 --- python-ipykernel.changes | 6 ++++++ python-ipykernel.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python-ipykernel.changes b/python-ipykernel.changes index 52dbd28..e9f3518 100644 --- a/python-ipykernel.changes +++ b/python-ipykernel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 28 12:08:06 UTC 2021 - Markéta Machová + +- Skip pickle tests to get rid of ipyparallel dependency which we + don't want in Ring1 stagings + ------------------------------------------------------------------- Fri Jul 23 08:22:28 UTC 2021 - Ben Greiner diff --git a/python-ipykernel.spec b/python-ipykernel.spec index e2509ef..2e179eb 100644 --- a/python-ipykernel.spec +++ b/python-ipykernel.spec @@ -61,7 +61,6 @@ BuildArch: noarch BuildRequires: %{python_module importlib-metadata if %python-base < 3.8} BuildRequires: %{python_module debugpy >= 1.0.0} BuildRequires: %{python_module flaky} -BuildRequires: %{python_module ipyparallel} BuildRequires: %{python_module ipython >= 7.23.1} BuildRequires: %{python_module jupyter-client} BuildRequires: %{python_module jupyter-core} @@ -84,6 +83,8 @@ This package provides the IPython kernel for Jupyter. %prep %autosetup -p1 -n ipykernel-%{version} +# 5 tests out of 95, we don't want ipyparallel and its dependencies in Ring1 +rm ipykernel/tests/test_pickleutil.py %build %python_build