From 4409941c51fe7c9ef44bdf2a32a5bfd062850cf5 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sep 26 2019 17:59:49 +0000 Subject: Update to 5.3.3 (bz 1727659, also fixes bz 1755635). Drop old workaround for dual python2/python3 builds. Use local objects.inv for intersphinx, BR python3-ipython-doc. --- diff --git a/.gitignore b/.gitignore index 5038bd7..185ff01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/jupyter_client-4.2.2.tar.gz -/jupyter_client-4.4.0.tar.gz -/jupyter_client-5.2.1.tar.gz -/jupyter_client-5.2.3.tar.gz +/jupyter_client-*.tar.gz diff --git a/python-jupyter-client-is.patch b/python-jupyter-client-is.patch new file mode 100644 index 0000000..d01aa53 --- /dev/null +++ b/python-jupyter-client-is.patch @@ -0,0 +1,13 @@ +Python 3.8 warns about incorrect use of "is not" with a literal. + +--- a/jupyter_client/manager.py 2019-09-13 16:11:50.000000000 -0600 ++++ b/jupyter_client/manager.py 2019-09-26 09:07:57.295032661 -0600 +@@ -78,7 +78,7 @@ class KernelManager(ConnectionFileMixin) + + @property + def kernel_spec(self): +- if self._kernel_spec is None and self.kernel_name is not '': ++ if self._kernel_spec is None and self.kernel_name != '': + self._kernel_spec = self.kernel_spec_manager.get_kernel_spec(self.kernel_name) + return self._kernel_spec + diff --git a/python-jupyter-client.spec b/python-jupyter-client.spec index b1f7a6e..27fc28c 100644 --- a/python-jupyter-client.spec +++ b/python-jupyter-client.spec @@ -3,13 +3,16 @@ %global pypi_name_dash jupyter-client Name: python-%{pypi_name_dash} -Version: 5.2.3 -Release: 10%{?dist} +Version: 5.3.3 +Release: 1%{?dist} Summary: Jupyter protocol implementation and client libraries License: BSD URL: http://jupyter.org -Source0: https://files.pythonhosted.org/packages/source/j/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: %pypi_source +# Eliminate a python 3.8 warning about use of "is" with a literal +Patch0: %{name}-is.patch + BuildArch: noarch BuildRequires: python3-setuptools @@ -24,14 +27,13 @@ BuildRequires: python3-sphinxcontrib-napoleon BuildRequires: python3-sphinxcontrib-github-alt BuildRequires: python3-dateutil +BuildRequires: python3-ipython-doc BuildRequires: python3-traitlets BuildRequires: python3-ipykernel BuildRequires: python3-jupyter-core -BuildRequires: python3-zmq >= 13 +BuildRequires: python3-zmq %endif -%?python_enable_dependency_generator - %description This package contains the reference implementation of the Jupyter protocol. It also provides client and kernel management APIs for working with kernels. @@ -61,7 +63,12 @@ Documentation of the reference implementation of the Jupyter protocol %endif %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -p1 -n %{pypi_name}-%{version} + +%if %{with doc} +# Use local objects.inv for intersphinx: +sed -i "s|\(('http://ipython.readthedocs.io/en/stable/', \)None)|\1'/usr/share/doc/python3-ipython-doc/html/objects.inv')|" docs/conf.py +%endif %build %py3_build @@ -70,8 +77,6 @@ Documentation of the reference implementation of the Jupyter protocol PYTHONPATH=build/lib/ sphinx-build-3 docs html # remove the sphinx-build leftovers rm -r html/.{doctrees,buildinfo} -# sphinx created this; it would put 3.X bytecode to py2 package -find build/lib/%{pypi_name} -name __pycache__ | xargs rm -rf %endif %install @@ -86,7 +91,7 @@ find build/lib/%{pypi_name} -name __pycache__ | xargs rm -rf %{_bindir}/jupyter-kernel %{_bindir}/jupyter-kernelspec %{_bindir}/jupyter-run -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_sitelib}/%{pypi_name}-%{version}-py?.*.egg-info %{python3_sitelib}/%{pypi_name}/ %if %{with doc} @@ -95,6 +100,11 @@ find build/lib/%{pypi_name} -name __pycache__ | xargs rm -rf %endif %changelog +* Thu Sep 26 2019 Jerry James - 5.3.3-1 +- Update to 5.3.3 (bz 1727659, also fixes bz 1755635) +- Drop old workaround for dual python2/python3 builds +- Use local objects.inv for intersphinx, BR python3-ipython-doc + * Sun Aug 18 2019 Miro HronĨok - 5.2.3-10 - Rebuilt for Python 3.8 diff --git a/sources b/sources index 2fc85f2..98353a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jupyter_client-5.2.3.tar.gz) = 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae +SHA512 (jupyter_client-5.3.3.tar.gz) = d1654538d11e24762d6b98a36ed548dac28259fb9aa357b2e70d595f4f1876942132cd822c0d0fb8c294850cc9c404e2247bc05a71ce317318c2a099c0cd841c