From f4635c975126529ae52a34f756d10760cfdca860 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Feb 14 2019 15:58:32 +0000
Subject: Update to 5.1.0, drop Python 2 package


---

diff --git a/.gitignore b/.gitignore
index f85c7da..b0e3a7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /ipykernel-4.5.2.tar.gz
 /ipykernel-4.6.0.tar.gz
 /ipykernel-4.8.2.tar.gz
+/ipykernel-5.1.0.tar.gz
diff --git a/python-ipykernel.spec b/python-ipykernel.spec
index 2a00771..847629e 100644
--- a/python-ipykernel.spec
+++ b/python-ipykernel.spec
@@ -1,15 +1,15 @@
 %global modname	ipykernel
 
 Name:		python-%{modname}
-Version:	4.8.2
-Release:	5%{?dist}
+Version:        5.1.0
+Release:        1%{?dist}
 Summary:	IPython Kernel for Jupyter
 License:	BSD
 URL:		https://github.com/ipython/%{modname}
 Source0:	https://github.com/ipython/%{modname}/archive/%{version}/%{modname}-%{version}.tar.gz
 BuildArch:	noarch
 
-BuildRequires:  %{_bindir}/sphinx-build-3
+BuildRequires:  python3-sphinx
 BuildRequires:  python3-sphinxcontrib-github-alt
 
 %global _description \
@@ -17,34 +17,6 @@ This package provides the IPython kernel for Jupyter.
 
 %description	%{_description}
 
-%package -n	python2-%{modname}
-Summary:	%{summary}
-%{?python_provide:%python_provide python2-%{modname}}
-BuildRequires:	python2-devel
-BuildRequires:  python2-ipython >= 4
-BuildRequires:  python2-jupyter-client
-BuildRequires:  python2-traitlets >= 4.1.0
-BuildRequires:  python2-tornado >= 4.0
-BuildRequires:  python2-mock
-BuildRequires:  python2-nose
-BuildRequires:  python2-nose_warnings_filters
-BuildRequires:  python2-numpy
-Requires:       python2-ipython >= 4
-Requires:       python2-jupyter-client
-Requires:       python2-traitlets >= 4.1.0
-Requires:       python2-tornado >= 4.0
-Requires:       python-jupyter-filesystem
-
-Recommends:     python2-matplotlib
-Recommends:     python2-numpy
-Recommends:     python2-pandas
-Recommends:     python2-scipy
-Recommends:     python2-pillow
-
-%description -n	python2-%{modname} %{_description}
-
-Python 2 version.
-
 %package -n	python%{python3_pkgversion}-%{modname}
 Summary:	%{summary}
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
@@ -55,6 +27,7 @@ BuildRequires:  python%{python3_pkgversion}-traitlets >= 4.1.0
 BuildRequires:  python%{python3_pkgversion}-tornado >= 4.0
 BuildRequires:  python%{python3_pkgversion}-nose
 BuildRequires:  python%{python3_pkgversion}-nose_warnings_filters
+BuildRequires:  python%{python3_pkgversion}-pytest
 BuildRequires:  python%{python3_pkgversion}-numpy
 Requires:       python%{python3_pkgversion}-ipython >= 4
 Requires:       python%{python3_pkgversion}-jupyter-client
@@ -82,7 +55,6 @@ This package contains the documentation of %{name}.
 %setup -q -n %{modname}-%{version}
 
 %build
-%py2_build
 %py3_build
 
 pushd docs
@@ -90,37 +62,21 @@ pushd docs
 popd
 
 %install
-%py2_install
 %py3_install
 mkdir -p %{buildroot}%{_docdir}/%{name}
 cp -fpavr docs/_build/html %{buildroot}%{_docdir}/%{name}
 rm %{buildroot}%{_docdir}/%{name}/html/{.buildinfo,objects.inv}
 
-# Install the kernels so they can be found
+# Install the kernel so it can be found
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1327979#c19
-%{__python2} -m ipykernel install --prefix %{buildroot}%{_prefix}
-ls %{buildroot}%{_datadir}/jupyter/kernels/python2/
-cat %{buildroot}%{_datadir}/jupyter/kernels/python2/kernel.json
-
 %{__python3} -m ipykernel install --prefix %{buildroot}%{_prefix}
 ls %{buildroot}%{_datadir}/jupyter/kernels/python3/
 cat %{buildroot}%{_datadir}/jupyter/kernels/python3/kernel.json
 
-# Remove Python 2 syntactically invalid file to survive the bytecompilation
-rm -f %{buildroot}%{python2_sitelib}/%{modname}/tests/_asyncio.py
-
 
 %check
-nosetests-2 ipykernel
-nosetests-3 ipykernel
-
-
-%files	-n python2-%{modname}
-%license COPYING.md
-%doc CONTRIBUTING.md MANIFEST.in README.md
-%{python2_sitelib}/%{modname}*
-%{python2_sitelib}/%{modname}*.egg-info
-%{_datadir}/jupyter/kernels/python2
+# https://github.com/ipython/ipykernel/issues/387#issuecomment-463657918
+%{__python3} -m pytest ipykernel -k "not test_sys_path and not test_sys_path_profile_dir and not test_complete"
 
 
 %files	-n python%{python3_pkgversion}-%{modname}
@@ -131,11 +87,14 @@ nosetests-3 ipykernel
 %{python3_sitelib}/__pycache__/%{modname}*
 %{_datadir}/jupyter/kernels/python3
 
-
 %files	doc
 %doc %{_docdir}/%{name}/html
 
+
 %changelog
+* Tue Feb 12 2019 Miro Hrončok <mhroncok@redhat.com> - 4.10.0-1
+- Update to 5.1.0, drop Python 2 package
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 97a7cf6..6cf5d6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ipykernel-4.8.2.tar.gz) = a6890cb8ed0b26a6fc73afb798d7825b4d491295e7a1cd71978f92feb580d34e770bd5c4f97610712709e7f5bf690088b1751dfb39f9c05af65d7ef3d9e0c68e
+SHA512 (ipykernel-5.1.0.tar.gz) = 6cab246b3bbfad3a877a411ab2aa908ad4e2070c736a89cd08122f48b81507d8c51c69cb8649a10760517efbbcc0e9da6534030c73f648f68a9d337f44dc88f7