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 48acf5c..493b9df 100644 --- a/python-jupyter-core.changes +++ b/python-jupyter-core.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +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 + +- 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 e742d6f..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 # @@ -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 @@ -24,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 @@ -40,11 +46,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 +Requires(postun):update-alternatives +%endif Recommends: python-ipython Provides: python-jupyter_core = %{version}-%{release} Obsoletes: python-jupyter_core < %{version}-%{release} @@ -57,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 @@ -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 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: