2019-11-12 16:43:17 +00:00
|
|
|
From: toddrme2178@gmail.com
|
|
|
|
|
Date: 2017-09-20
|
|
|
|
|
Subject: Use rpm paths
|
|
|
|
|
|
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
2021-02-03 12:33:57 +00:00
|
|
|
Use single-line paths. These must be replaced with the appropriate
|
2019-11-12 16:43:17 +00:00
|
|
|
system paths in the .spec file.
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
|
2023-12-23 19:34:15 +00:00
|
|
|
Index: jupyter_core-5.5.1/jupyter_core/paths.py
|
2022-08-01 18:07:11 +00:00
|
|
|
===================================================================
|
2023-12-23 19:34:15 +00:00
|
|
|
--- jupyter_core-5.5.1.orig/jupyter_core/paths.py
|
|
|
|
|
+++ jupyter_core-5.5.1/jupyter_core/paths.py
|
|
|
|
|
@@ -221,10 +221,7 @@ else:
|
2022-12-25 20:40:52 +00:00
|
|
|
else: # PROGRAMDATA is not defined by default on XP.
|
2023-12-23 19:34:15 +00:00
|
|
|
SYSTEM_JUPYTER_PATH = [str(Path(sys.prefix, "share", "jupyter"))]
|
2022-12-25 20:40:52 +00:00
|
|
|
else:
|
|
|
|
|
- SYSTEM_JUPYTER_PATH = [
|
|
|
|
|
- "/usr/local/share/jupyter",
|
|
|
|
|
- "/usr/share/jupyter",
|
|
|
|
|
- ]
|
2023-10-07 13:35:18 +00:00
|
|
|
+ SYSTEM_JUPYTER_PATH = [ "@_datadir_jupyter_@" ]
|
2019-11-12 16:43:17 +00:00
|
|
|
|
2023-12-23 19:34:15 +00:00
|
|
|
ENV_JUPYTER_PATH: list[str] = [str(Path(sys.prefix, "share", "jupyter"))]
|
2019-11-12 16:43:17 +00:00
|
|
|
|
2023-12-23 19:34:15 +00:00
|
|
|
@@ -245,10 +242,10 @@ def jupyter_path(*subdirs: str) -> list[
|
2023-10-07 13:35:18 +00:00
|
|
|
|
|
|
|
|
Examples:
|
|
|
|
|
|
|
|
|
|
- >>> jupyter_path()
|
|
|
|
|
- ['~/.local/jupyter', '/usr/local/share/jupyter']
|
|
|
|
|
- >>> jupyter_path('kernels')
|
|
|
|
|
- ['~/.local/jupyter/kernels', '/usr/local/share/jupyter/kernels']
|
|
|
|
|
+ >>> jupyter_path() # doctest: +SKIP
|
|
|
|
|
+ ['~/.local/share/jupyter', '@_datadir_jupyter_@']
|
|
|
|
|
+ >>> jupyter_path('kernels') # doctest: +SKIP
|
|
|
|
|
+ ['~/.local/share/jupyter/kernels', '@_datadir_jupyter_@/kernels']
|
|
|
|
|
"""
|
|
|
|
|
|
2023-12-23 19:34:15 +00:00
|
|
|
paths: list[str] = []
|
|
|
|
|
@@ -301,8 +298,7 @@ else:
|
2022-12-25 20:40:52 +00:00
|
|
|
SYSTEM_CONFIG_PATH = []
|
|
|
|
|
else:
|
2023-12-23 19:34:15 +00:00
|
|
|
SYSTEM_CONFIG_PATH = [
|
2022-12-25 20:40:52 +00:00
|
|
|
- "/usr/local/etc/jupyter",
|
|
|
|
|
- "/etc/jupyter",
|
2023-12-23 19:34:15 +00:00
|
|
|
+ "@_distconfdir_jupyter_@"
|
|
|
|
|
]
|
|
|
|
|
ENV_CONFIG_PATH: list[str] = [str(Path(sys.prefix, "etc", "jupyter"))]
|
2019-11-12 16:43:17 +00:00
|
|
|
|
