- python-ipykernel.spec as python3-ipykernel.spec, updated to 5.1.3 for python 3.4+
authorJakub Bogusz <qboosh@pld-linux.org>
Wed, 6 Nov 2019 19:44:30 +0000 (20:44 +0100)
committerJakub Bogusz <qboosh@pld-linux.org>
Wed, 6 Nov 2019 19:44:30 +0000 (20:44 +0100)
- removed obsolete use_setuptools patch

python-ipykernel-use_setuptools.patch [deleted file]
python3-ipykernel.spec [moved from python-ipykernel.spec with 54% similarity]

diff --git a/python-ipykernel-use_setuptools.patch b/python-ipykernel-use_setuptools.patch
deleted file mode 100644 (file)
index ddbd848..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- ipykernel-4.10.1/setup.py.orig     2019-08-08 23:42:36.000000000 +0200
-+++ ipykernel-4.10.1/setup.py  2019-09-30 21:25:15.196203718 +0200
-@@ -76,7 +76,7 @@
-     ],
- )
--if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv):
-+if True:
-     import setuptools
- setuptools_args = {}
similarity index 54%
rename from python-ipykernel.spec
rename to python3-ipykernel.spec
index 00c746ec7ccead24c125003fe44fb27ee382b21f..77c46645818b017b9500f628f544aa44a6a01634 100644 (file)
@@ -2,56 +2,36 @@
 # Conditional build:
 %bcond_without doc     # Sphinx documentation
 %bcond_without tests   # unit tests
-%bcond_without python2 # CPython 2.x module
-%bcond_without python3 # CPython 3.x module
 
 Summary:       IPython kernel for Jupyter
 Summary(pl.UTF-8):     Jądro IPythona dla Jupytera
-Name:          python-ipykernel
-Version:       4.10.1
-Release:       3
+Name:          python3-ipykernel
+Version:       5.1.3
+Release:       1
 License:       BSD
 Group:         Libraries/Python
 #Source0Download: https://pypi.org/simple/ipykernel/
 Source0:       https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-%{version}.tar.gz
-# Source0-md5: 23871bb7da2907749cb65a9446c9e637
-Patch0:                %{name}-use_setuptools.patch
+# Source0-md5: c1d0ff3d8f7e8517a44fef33516929ec
 URL:           https://pypi.org/project/ipykernel/
-%if %{with python2}
-BuildRequires: python-modules >= 1:2.7
-BuildRequires: python-setuptools
-%if %{with tests}
-BuildRequires: python-ipython >= 4.0.0
-BuildRequires: python-jupyter_client
-BuildRequires: python-mock
-BuildRequires: python-nose
-BuildRequires: python-pytest
-BuildRequires: python-pytest-cov
-BuildRequires: python-traitlets >= 4.1.0
-BuildRequires: python-tornado >= 4.0
-%endif
-%endif
-%if %{with python3}
 BuildRequires: python3-modules >= 1:3.4
 BuildRequires: python3-setuptools
 %if %{with tests}
-BuildRequires: python3-ipython >= 4.0.0
+BuildRequires: python3-ipython >= 5.0.0
 BuildRequires: python3-jupyter_client
 BuildRequires: python3-nose
 BuildRequires: python3-pytest
 BuildRequires: python3-pytest-cov
 BuildRequires: python3-traitlets >= 4.1.0
-BuildRequires: python3-tornado >= 4.0
-%endif
+BuildRequires: python3-tornado >= 4.2
 %endif
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714
-BuildRequires: sed >= 4.0
 %if %{with doc}
 BuildRequires: python3-sphinxcontrib_github_alt
 BuildRequires: sphinx-pdg-3
 %endif
-Requires:      python-modules >= 1:2.7
+Requires:      python3-modules >= 1:3.4
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,18 +41,6 @@ This package provides the IPython kernel for Jupyter.
 %description -l pl.UTF-8
 Ten pakiet dostarcza jądro IPythona dla Jupytera.
 
-%package -n python3-ipykernel
-Summary:       IPython kernel for Jupyter
-Summary(pl.UTF-8):     Jądro IPythona dla Jupytera
-Group:         Libraries/Python
-Requires:      python3-modules >= 1:3.4
-
-%description -n python3-ipykernel
-This package provides the IPython kernel for Jupyter.
-
-%description -n python3-ipykernel -l pl.UTF-8
-Ten pakiet dostarcza jądro IPythona dla Jupytera.
-
 %package apidocs
 Summary:       API documentation for Python ipykernel module
 Summary(pl.UTF-8):     Dokumentacja API modułu Pythona ipykernel
@@ -86,27 +54,14 @@ Dokumentacja API modułu Pythona ipykernel.
 
 %prep
 %setup -q -n ipykernel-%{version}
-%patch0 -p1
 
 %build
-%if %{with python2}
-%py_build
-
-%if %{with tests}
-# test_oinfo_detail test requires ipython source code
-PYTHONPATH=$(pwd) \
-%{__python} -m pytest -k 'not test_oinfo_detail' ipykernel
-%endif
-%endif
-
-%if %{with python3}
 %py3_build
 
 %if %{with tests}
 PYTHONPATH=$(pwd) \
 %{__python3} -m pytest ipykernel
 %endif
-%endif
 
 %if %{with doc}
 %{__make} -C docs html \
@@ -116,20 +71,6 @@ PYTHONPATH=$(pwd) \
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with python2}
-%py_install
-
-install -d $RPM_BUILD_ROOT%{_examplesdir}/python-ipykernel-%{version}
-cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/python-ipykernel-%{version}
-find $RPM_BUILD_ROOT%{_examplesdir}/python-ipykernel-%{version} -name '*.py' \
-       | xargs sed -i '1s|/usr/bin/env python|%{__python}|'
-
-%py_postclean
-%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/ipykernel/tests \
-       $RPM_BUILD_ROOT%{py_sitescriptdir}/ipykernel/inprocess/tests
-%endif
-
-%if %{with python3}
 %py3_install
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/python3-ipykernel-%{version}
@@ -139,28 +80,13 @@ find $RPM_BUILD_ROOT%{_examplesdir}/python3-ipykernel-%{version} -name '*.py' \
 
 %{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/ipykernel/tests \
        $RPM_BUILD_ROOT%{py3_sitescriptdir}/ipykernel/inprocess/tests
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with python2}
 %files
 %defattr(644,root,root,755)
 %doc COPYING.md README.md
-%{py_sitescriptdir}/ipykernel
-%{py_sitescriptdir}/ipykernel_launcher.py[co]
-%{py_sitescriptdir}/ipykernel-%{version}-py*.egg-info
-%dir %{_datadir}/jupyter
-%dir %{_datadir}/jupyter/kernels
-%{_datadir}/jupyter/kernels/python2
-%{_examplesdir}/python-ipykernel-%{version}
-%endif
-
-%if %{with python3}
-%files -n python3-ipykernel
-%defattr(644,root,root,755)
-%doc COPYING.md README.md
 %{py3_sitescriptdir}/ipykernel
 %{py3_sitescriptdir}/ipykernel_launcher.py
 %{py3_sitescriptdir}/__pycache__/ipykernel_launcher.cpython-*.py[co]
@@ -169,7 +95,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/jupyter/kernels
 %{_datadir}/jupyter/kernels/python3
 %{_examplesdir}/python3-ipykernel-%{version}
-%endif
 
 %if %{with doc}
 %files apidocs
This page took 0.182074 seconds and 4 git commands to generate.