Hello community,
here is the log from the commit of package python3-jupyter_core for
openSUSE:Factory checked in at 2016-10-20 23:09:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-jupyter_core (Old)
and /work/SRC/openSUSE:Factory/.python3-jupyter_core.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-jupyter_core"
Changes:
--------
---
/work/SRC/openSUSE:Factory/python3-jupyter_core/python3-jupyter_core.changes
2016-05-25 21:27:06.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python3-jupyter_core.new/python3-jupyter_core.changes
2016-10-20 23:09:58.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Oct 18 15:55:13 UTC 2016 - [email protected]
+
+- Keep all upstream directories in version_specific_dirs.patch
+
+-------------------------------------------------------------------
+Mon Oct 17 22:41:01 UTC 2016 - [email protected]
+
+- Add version_specific_dirs.patch
+ Uses python version-specific directories to avoid conflicts.
+- Install the directories used for system-side settings and data so
+ they are properly owned by this package.
+
+-------------------------------------------------------------------
New:
----
version_specific_dirs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-jupyter_core.spec ++++++
--- /var/tmp/diff_new_pack.loSMFh/_old 2016-10-20 23:09:59.000000000 +0200
+++ /var/tmp/diff_new_pack.loSMFh/_new 2016-10-20 23:09:59.000000000 +0200
@@ -24,6 +24,8 @@
Group: Development/Languages/Python
Url: http://jupyter.org
Source:
https://files.pythonhosted.org/packages/source/j/jupyter_core/jupyter_core-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE version_specific_dirs.patch -- Install into different
directories for different python versions
+Patch0: version_specific_dirs.patch
BuildRequires: python3-devel >= 3.3
BuildRequires: python3-ipython_genutils
BuildRequires: python3-setuptools
@@ -52,6 +54,7 @@
%prep
%setup -q -n jupyter_core-%{version}
+%patch0 -p1
%build
python3 setup.py build
@@ -68,11 +71,13 @@
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
for p in jupyter jupyter-migrate ; do
- ln -s -f %{_sysconfdir}/alternatives/$p %{buildroot}%{_bindir}/$p
- # create a dummy target for /etc/alternatives/$p
- touch %{buildroot}%{_sysconfdir}/alternatives/$p
+ ln -sf %{_sysconfdir}/alternatives/$p %{buildroot}%{_bindir}/$p
done
+# these directories are used by extensions
+mkdir -p %{buildroot}%{_datadir}/jupyter_python%{py3_ver}/
+mkdir -p %{buildroot}%{_sysconfdir}/jupyter_python%{py3_ver}/
+
%check
pushd jupyter_core/tests
# test_migrate requires files not found in the package
@@ -108,5 +113,7 @@
%{python3_sitelib}/__pycache__/jupyter.*.pyc
%{python3_sitelib}/jupyter_core/
%{python3_sitelib}/jupyter_core-%{version}-*.egg-info
+%{_datadir}/jupyter_python%{py3_ver}/
+%{_sysconfdir}/jupyter_python%{py3_ver}/
%changelog
++++++ version_specific_dirs.patch ++++++
rom: [email protected]
Date: 2016-10-17 18:24:44 +0000
Subject: Use version-specific directories
Normally system-wide installation uses a single hard-coded directory
for all versions. This patch changes that to use directories
tied to the specific Python version to allow parallel installation
of multiple versions.
---
--- a/jupyter_core/paths.py
+++ b/jupyter_core/paths.py
@@ -102,11 +102,12 @@
SYSTEM_JUPYTER_PATH = [os.path.join(sys.prefix, 'share', 'jupyter')]
else:
SYSTEM_JUPYTER_PATH = [
+ "/usr/share/jupyter_python{0}.{1}".format(*sys.version_info),
"/usr/local/share/jupyter",
"/usr/share/jupyter",
]
-ENV_JUPYTER_PATH = [os.path.join(sys.prefix, 'share', 'jupyter')]
+ENV_JUPYTER_PATH = [os.path.join(sys.prefix, 'share',
'jupyter_python{0}.{1}'.format(*sys.version_info))]
def jupyter_path(*subdirs):
@@ -154,11 +155,12 @@
SYSTEM_CONFIG_PATH = []
else:
SYSTEM_CONFIG_PATH = [
+ "/etc/jupyter_python{0}.{1}".format(*sys.version_info),
"/usr/local/etc/jupyter",
"/etc/jupyter",
]
-ENV_CONFIG_PATH = [os.path.join(sys.prefix, 'etc', 'jupyter')]
+ENV_CONFIG_PATH = [os.path.join(sys.prefix, 'etc',
'jupyter_python{0}.{1}'.format(*sys.version_info))]
def jupyter_config_path():
