From 182c7b16ce43358b12db364a2daafe388416dd383c57c6ec8797de855557f65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 3 Feb 2021 12:33:57 +0000 Subject: [PATCH] Accepting request 868748 from home:bnavigator:branches:devel:languages:python:jupyter - Update to 4.7.1 * Allow creating user to delete secure file - Changelog for 4.7.0 * Add a new JUPYTER_PREFER_ENV_PATH variable, which can be set to switch the order of the environment-level path and the user-level path in the Jupyter path hierarchy (e.g., jupyter --paths). It is considered set if it is a value that is not one of 'no', 'n', 'off', 'false', '0', or '0.0' (case insensitive). If you are running Jupyter in multiple virtual environments as the same user, you will likely want to set this environment variable. * Drop Python 2.x and 3.5 support, as they have reached end of life. * jupyter --paths --debug now explains the environment variables that affect the current path list. * Add conda environment information in jupyter troubleshoot. * Update _version.version_info and _version.__version__ to follow Python conventions. - merge jupyter package as capability into the primary python package - fix replacement of paths: * fix noop introduced by overeager specfile-cleaner for system paths, adjust use_rpm_paths.patch * don't replace ENV_CONFIG_PATH or ENV_JUPYTER_PATH because that would break virtual environments. See also gh#jupyter/jupyter_core#208 OBS-URL: https://build.opensuse.org/request/show/868748 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-jupyter-core?expand=0&rev=12 --- jupyter_core-4.6.3.tar.gz | 3 -- jupyter_core-4.7.1.tar.gz | 3 ++ python-jupyter-core.changes | 30 ++++++++++++ python-jupyter-core.spec | 91 ++++++++++++++----------------------- use_rpms_paths.patch | 6 +-- 5 files changed, 69 insertions(+), 64 deletions(-) delete mode 100644 jupyter_core-4.6.3.tar.gz create mode 100644 jupyter_core-4.7.1.tar.gz diff --git a/jupyter_core-4.6.3.tar.gz b/jupyter_core-4.6.3.tar.gz deleted file mode 100644 index cdda04b..0000000 --- a/jupyter_core-4.6.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e -size 67305 diff --git a/jupyter_core-4.7.1.tar.gz b/jupyter_core-4.7.1.tar.gz new file mode 100644 index 0000000..fa5ed20 --- /dev/null +++ b/jupyter_core-4.7.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79025cb3225efcd36847d0840f3fc672c0abd7afd0de83ba8a1d3837619122b4 +size 68886 diff --git a/python-jupyter-core.changes b/python-jupyter-core.changes index 3b21879..1bdb8cd 100644 --- a/python-jupyter-core.changes +++ b/python-jupyter-core.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Sun Jan 31 17:57:15 UTC 2021 - Ben Greiner + +- Update to 4.7.1 + * Allow creating user to delete secure file +- Changelog for 4.7.0 + * Add a new JUPYTER_PREFER_ENV_PATH variable, which can be set + to switch the order of the environment-level path and the + user-level path in the Jupyter path hierarchy (e.g., jupyter + --paths). It is considered set if it is a value that is not + one of 'no', 'n', 'off', 'false', '0', or '0.0' (case + insensitive). If you are running Jupyter in multiple virtual + environments as the same user, you will likely want to set + this environment variable. + * Drop Python 2.x and 3.5 support, as they have reached end of + life. + * jupyter --paths --debug now explains the environment + variables that affect the current path list. + * Add conda environment information in jupyter troubleshoot. + * Update _version.version_info and _version.__version__ to + follow Python conventions. +- merge jupyter package as capability into the primary python + package +- fix replacement of paths: + * fix noop introduced by overeager specfile-cleaner for system + paths, adjust use_rpm_paths.patch + * don't replace ENV_CONFIG_PATH or ENV_JUPYTER_PATH because that + would break virtual environments. See also + gh#jupyter/jupyter_core#208 + ------------------------------------------------------------------- Sat Mar 28 07:39:17 UTC 2020 - Tomáš Chvátal diff --git a/python-jupyter-core.spec b/python-jupyter-core.spec index c41223a..ed0458c 100644 --- a/python-jupyter-core.spec +++ b/python-jupyter-core.spec @@ -1,7 +1,7 @@ # # spec file for package python-jupyter-core # -# 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 @@ -26,9 +26,9 @@ %endif %bcond_without python2 %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define oldpython python +%define skip_python2 1 Name: python-jupyter-core%{psuffix} -Version: 4.6.3 +Version: 4.7.1 Release: 0 Summary: Base package on which Jupyter projects rely License: BSD-3-Clause @@ -36,30 +36,27 @@ URL: https://github.com/jupyter/jupyter_core Source0: https://files.pythonhosted.org/packages/source/j/jupyter_core/jupyter_core-%{version}.tar.gz # PATCH-FIX-OPENSUSE -- use_rpms_paths.patch -- change paths so they are easy to replace at build time Patch0: use_rpms_paths.patch -BuildRequires: %{python_module ipython_genutils} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module traitlets} BuildRequires: fdupes BuildRequires: jupyter-jupyter_core-filesystem BuildRequires: python-rpm-macros -Requires: jupyter-jupyter_core = %{version} -Requires: python-ipython_genutils Requires: python-traitlets +Requires(post): update-alternatives +Requires(postun): update-alternatives Recommends: python-ipython -Provides: python-jupyter_core = %{version} -Obsoletes: python-jupyter_core < %{version} -BuildArch: noarch -%ifpython2 -Provides: %{oldpython}-jupyter_core = %{version} -Obsoletes: %{oldpython}-jupyter_core < %{version} +Provides: python-jupyter_core = %{version}-%{release} +Obsoletes: python-jupyter_core < %{version}-%{release} +%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" +Provides: jupyter-jupyter-core = %{version}-%{release} +Obsoletes: jupyter-jupyter-core < %{version}-%{release} +Provides: jupyter-jupyter_core = %{version}-%{release} +Obsoletes: jupyter-jupyter_core < %{version}-%{release} %endif +BuildArch: noarch %if %{with test} BuildRequires: %{python_module jupyter-core} -BuildRequires: %{python_module nose} BuildRequires: %{python_module pytest} -%if %{with python2} -BuildRequires: python-mock -%endif %endif %python_subpackages @@ -72,36 +69,12 @@ other projects. It doesn't do much on its own. There is no reason to install this package on its own. It will be pulled in as a dependency by packages that require it. -This package provides the python interface. - -%package -n jupyter-jupyter-core -Summary: Base package on which Jupyter projects rely -Requires: jupyter-notebook-filesystem -Requires: python3-jupyter-core = %{version} -Provides: jupyter-jupyter_core = %{version} -Obsoletes: jupyter-jupyter_core < %{version} -Provides: jupyter-jupyter-core-doc = %{version} -Obsoletes: jupyter-jupyter-core-doc < %{version} - -%description -n jupyter-jupyter-core -Core common functionality of Jupyter projects. - -This package contains base application classes and configuration inherited by -other projects. It doesn't do much on its own. - -There is no reason to install this package on its own. It will be pulled in -as a dependency by packages that require it. - -This package provides the jupyter components. - %prep %setup -q -n jupyter_core-%{version} %patch0 -p1 -# Set the appropriate paths dynamically -sed -i "s|\"%{_datadir}/jupyter\"|\"%{_datadir}/jupyter\"|" jupyter_core/paths.py -sed -i "s|\"%{_sysconfdir}/jupyter\"|\"%{_sysconfdir}/jupyter\"|" jupyter_core/paths.py -sed -i "s|(sys\.prefix, 'share', 'jupyter')|('%{_datadir}', 'jupyter')|" jupyter_core/paths.py -sed -i "s|(sys\.prefix, 'etc', 'jupyter')|('%{_sysconfdir}', 'jupyter')|" jupyter_core/paths.py +# Set the appropriate hardcoded paths dynamically +sed -i "s|\"_datadir_jupyter_\"|\"%{_datadir}/jupyter\"|" jupyter_core/paths.py +sed -i "s|\"_sysconfdir_jupyter_\"|\"%{_sysconfdir}/jupyter\"|" jupyter_core/paths.py %build %python_build @@ -109,38 +82,40 @@ sed -i "s|(sys\.prefix, 'etc', 'jupyter')|('%{_sysconfdir}', 'jupyter')|" jupyte %install %if !%{with test} %python_install - +%python_clone -a %{buildroot}%{_bindir}/jupyter +%python_clone -a %{buildroot}%{_bindir}/jupyter-migrate +%python_clone -a %{buildroot}%{_bindir}/jupyter-troubleshoot %{python_expand chmod a+x %{buildroot}%{$python_sitelib}/jupyter_core/troubleshoot.py sed -i "s|^#!%{_bindir}/env python$|#!%{__$python}|" %{buildroot}%{$python_sitelib}/jupyter_core/troubleshoot.py -$python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/jupyter_core/ -$python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/jupyter_core/ -%fdupes %{buildroot}%{$python_sitelib} } +%python_compileall +%python_expand %fdupes %{buildroot}%{$python_sitelib} %endif %if %{with test} %check -# test_migrate requires files not found in the package pushd jupyter_core/tests -rm test_migrate.py -%pytest +# test_jupyter_path_prefer_env does not work outside venvs: gh#jupyter/jupyter_core#208 +%pytest -k "not test_jupyter_path_prefer_env" popd %endif +%post +%python_install_alternative jupyter jupyter-migrate jupyter-troubleshoot + +%postun +%python_uninstall_alternative jupyter + %if !%{with test} %files %{python_files} %license COPYING.md +%python_alternative %{_bindir}/jupyter +%python_alternative %{_bindir}/jupyter-migrate +%python_alternative %{_bindir}/jupyter-troubleshoot %{python_sitelib}/jupyter.py* %pycache_only %{python_sitelib}/__pycache__/jupyter.*.py* %{python_sitelib}/jupyter_core/ -%{python_sitelib}/jupyter_core-%{version}-*.egg-info - -%files -n jupyter-jupyter-core -%license COPYING.md -%doc CONTRIBUTING.md README.md -%{_bindir}/jupyter -%{_bindir}/jupyter-migrate -%{_bindir}/jupyter-troubleshoot +%{python_sitelib}/jupyter_core-%{version}*-info %endif %changelog diff --git a/use_rpms_paths.patch b/use_rpms_paths.patch index 2a9e989..f318b66 100644 --- a/use_rpms_paths.patch +++ b/use_rpms_paths.patch @@ -2,7 +2,7 @@ From: toddrme2178@gmail.com Date: 2017-09-20 Subject: Use rpm paths -Use single-line paths. These should be replaced with the appropriate +Use single-line paths. These must be replaced with the appropriate system paths in the .spec file. --- @@ -17,7 +17,7 @@ system paths in the .spec file. - "/usr/local/share/jupyter", - "/usr/share/jupyter", - ] -+ SYSTEM_JUPYTER_PATH = ["/usr/share/jupyter"] ++ SYSTEM_JUPYTER_PATH = ["_datadir_jupyter_"] ENV_JUPYTER_PATH = [os.path.join(sys.prefix, 'share', 'jupyter')] @@ -29,7 +29,7 @@ system paths in the .spec file. - "/usr/local/etc/jupyter", - "/etc/jupyter", - ] -+ SYSTEM_CONFIG_PATH = ["/etc/jupyter"] ++ SYSTEM_CONFIG_PATH = ["_sysconfdir_jupyter_"] ENV_CONFIG_PATH = [os.path.join(sys.prefix, 'etc', 'jupyter')]