From f98d98f24e080745e6e854ee04215ccb89b06cc21c2f4491b4106b7d43ae5a35 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 25 Feb 2021 20:53:14 +0000 Subject: [PATCH 1/3] Update patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-jupyter-core?expand=0&rev=16 --- python-jupyter-core.spec | 4 ++-- use_rpms_paths.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python-jupyter-core.spec b/python-jupyter-core.spec index e742d6f..a3968a5 100644 --- a/python-jupyter-core.spec +++ b/python-jupyter-core.spec @@ -1,5 +1,5 @@ # -# spec file for package python-jupyter-core +# spec file for package python-jupyter-core-test # # Copyright (c) 2021 SUSE LLC # @@ -44,7 +44,7 @@ BuildRequires: python-rpm-macros Requires: jupyter-jupyter_core-filesystem Requires: python-traitlets Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Recommends: python-ipython Provides: python-jupyter_core = %{version}-%{release} Obsoletes: python-jupyter_core < %{version}-%{release} diff --git a/use_rpms_paths.patch b/use_rpms_paths.patch index f318b66..988b84f 100644 --- a/use_rpms_paths.patch +++ b/use_rpms_paths.patch @@ -9,7 +9,7 @@ system paths in the .spec file. --- a/jupyter_core/paths.py +++ b/jupyter_core/paths.py -@@ -117,10 +117,7 @@ +@@ -124,10 +124,7 @@ if os.name == 'nt': else: # PROGRAMDATA is not defined by default on XP. SYSTEM_JUPYTER_PATH = [os.path.join(sys.prefix, 'share', 'jupyter')] else: @@ -21,7 +21,7 @@ system paths in the .spec file. ENV_JUPYTER_PATH = [os.path.join(sys.prefix, 'share', 'jupyter')] -@@ -169,10 +166,7 @@ +@@ -186,10 +183,7 @@ if os.name == 'nt': else: # PROGRAMDATA is not defined by default on XP. SYSTEM_CONFIG_PATH = [] else: From 979b3dbaea6dc522b54211c7ec4e829ad612f24d6c38ce1e28d1f6abbc4d4b8d Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Wed, 6 Oct 2021 09:14:43 +0000 Subject: [PATCH 2/3] Accepting request 923302 from home:schubi2 - Use libalternatives instead of update-alternatives. OBS-URL: https://build.opensuse.org/request/show/923302 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-jupyter-core?expand=0&rev=17 --- python-jupyter-core.changes | 5 +++++ python-jupyter-core.spec | 21 +++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/python-jupyter-core.changes b/python-jupyter-core.changes index 48acf5c..e009745 100644 --- a/python-jupyter-core.changes +++ b/python-jupyter-core.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 5 15:35:48 UTC 2021 - Stefan Schubert + +- Use libalternatives instead of update-alternatives. + ------------------------------------------------------------------- Wed Feb 3 22:46:22 UTC 2021 - Benjamin Greiner diff --git a/python-jupyter-core.spec b/python-jupyter-core.spec index a3968a5..8ed8e44 100644 --- a/python-jupyter-core.spec +++ b/python-jupyter-core.spec @@ -1,5 +1,5 @@ # -# spec file for package python-jupyter-core-test +# spec file for package python-jupyter-core # # Copyright (c) 2021 SUSE LLC # @@ -16,6 +16,13 @@ # +# +%if 0%{?suse_version} > 1500 +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif + %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -40,11 +47,16 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module traitlets} BuildRequires: fdupes BuildRequires: jupyter-jupyter_core-filesystem -BuildRequires: python-rpm-macros +BuildRequires: python-rpm-macros >= 20210929 Requires: jupyter-jupyter_core-filesystem Requires: python-traitlets +%if %{with libalternatives} +BuildRequires: alts +Requires: alts +%else Requires(post): update-alternatives Requires(postun):update-alternatives +%endif Recommends: python-ipython Provides: python-jupyter_core = %{version}-%{release} Obsoletes: python-jupyter_core < %{version}-%{release} @@ -101,6 +113,11 @@ pushd jupyter_core/tests popd %endif +%pre +# removing old update-alternatives entries +# If libalternatives is used: Removing old update-alternatives entries. +%python_libalternatives_reset_alternative jupyter + %post %python_install_alternative jupyter jupyter-migrate jupyter-troubleshoot From 670cc9a082a925ed38e5be29d2aa9ff26d993998c251b5568ca5ab96b26c9846 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sun, 17 Oct 2021 21:54:00 +0000 Subject: [PATCH 3/3] Accepting request 925885 from home:bnavigator:branches:devel:languages:python:jupyter - Update to version 4.8.1 * Print an error message instead of an exception when a command is not found (PR #218) * Return canonical path when using %APPDATA% on Windows (PR #222) * Print full usage on missing or invalid commands (PR #225) * Remove dependency on pywin32 package on PyPy (PR #230) * Update packages listed in jupyter --version (PR #232) * Inherit base aliases/flags from traitlets Application, including --show-config from traitlets 5 (PR #233) * Trigger warning when trying to check hidden file status on PyPy (PR #238) OBS-URL: https://build.opensuse.org/request/show/925885 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-jupyter-core?expand=0&rev=18 --- jupyter_core-4.7.1.tar.gz | 3 --- jupyter_core-4.8.1.tar.gz | 3 +++ python-jupyter-core.changes | 15 +++++++++++++++ python-jupyter-core.spec | 6 +++--- 4 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 jupyter_core-4.7.1.tar.gz create mode 100644 jupyter_core-4.8.1.tar.gz diff --git a/jupyter_core-4.7.1.tar.gz b/jupyter_core-4.7.1.tar.gz deleted file mode 100644 index fa5ed20..0000000 --- a/jupyter_core-4.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79025cb3225efcd36847d0840f3fc672c0abd7afd0de83ba8a1d3837619122b4 -size 68886 diff --git a/jupyter_core-4.8.1.tar.gz b/jupyter_core-4.8.1.tar.gz new file mode 100644 index 0000000..1d9bf69 --- /dev/null +++ b/jupyter_core-4.8.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef210dcb4fca04de07f2ead4adf408776aca94d17151d6f750ad6ded0b91ea16 +size 73579 diff --git a/python-jupyter-core.changes b/python-jupyter-core.changes index e009745..493b9df 100644 --- a/python-jupyter-core.changes +++ b/python-jupyter-core.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun Oct 17 17:28:20 UTC 2021 - Ben Greiner + +- Update to version 4.8.1 + * Print an error message instead of an exception when a command + is not found (PR #218) + * Return canonical path when using %APPDATA% on Windows (PR #222) + * Print full usage on missing or invalid commands (PR #225) + * Remove dependency on pywin32 package on PyPy (PR #230) + * Update packages listed in jupyter --version (PR #232) + * Inherit base aliases/flags from traitlets Application, + including --show-config from traitlets 5 (PR #233) + * Trigger warning when trying to check hidden file status on PyPy + (PR #238) + ------------------------------------------------------------------- Tue Oct 5 15:35:48 UTC 2021 - Stefan Schubert diff --git a/python-jupyter-core.spec b/python-jupyter-core.spec index 8ed8e44..98655f4 100644 --- a/python-jupyter-core.spec +++ b/python-jupyter-core.spec @@ -1,5 +1,5 @@ # -# spec file for package python-jupyter-core +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -31,11 +31,10 @@ %define psuffix %{nil} %bcond_with test %endif -%bcond_without python2 %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-jupyter-core%{psuffix} -Version: 4.7.1 +Version: 4.8.1 Release: 0 Summary: Base package on which Jupyter projects rely License: BSD-3-Clause @@ -69,6 +68,7 @@ Obsoletes: jupyter-jupyter_core < %{version}-%{release} BuildArch: noarch %if %{with test} BuildRequires: %{python_module jupyter-core} +BuildRequires: %{python_module pytest-timeout} BuildRequires: %{python_module pytest} %endif %python_subpackages