diff --git a/python-metakernel.spec b/python-metakernel.spec index 2946ea7..3ae6b88 100644 --- a/python-metakernel.spec +++ b/python-metakernel.spec @@ -1,17 +1,10 @@ -%if %{?fedora}%{!?fedora:0} >= 30 || %{?rhel}%{!?rhel:0} >= 8 -# Don't build Python 2 packages for Fedora >= 30 -%global buildpy2 0 -%else -%global buildpy2 1 -%endif - Name: python-metakernel -# The python, echo and bash subpackages have their own version +# The python and echo subpackages have their own version # and release numbers - update below in each package section # Running rpmdev-bumpspec on this specfile will update all the # release tags automatically -Version: 0.24.3 -Release: 2%{?dist} +Version: 0.24.4 +Release: 1%{?dist} %global pkgversion %{version} %global pkgrelease %{release} Summary: Metakernel for Jupyter @@ -21,16 +14,6 @@ URL: https://github.com/Calysto/metakernel Source0: https://github.com/Calysto/metakernel/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch -%if %{buildpy2} -BuildRequires: python2-devel -BuildRequires: python2-ipykernel -BuildRequires: python2-pexpect >= 4.2 -# For testing: -BuildRequires: python2-pytest -BuildRequires: python2-requests -BuildRequires: python2-ipyparallel -BuildRequires: python2-jedi -%endif BuildRequires: python3-devel BuildRequires: python3-ipykernel BuildRequires: python3-pexpect >= 4.2 @@ -51,44 +34,12 @@ A Jupyter/IPython kernel template which includes core magic functions (including help, command and file path completion, parallel and distributed processing, downloads, and much more). -%if %{buildpy2} -%package -n python2-metakernel -Summary: Metakernel for Jupyter -%{?python_provide:%python_provide python2-metakernel} -Requires: python2-ipykernel -Requires: python2-pexpect >= 4.2 -Obsoletes: python2-metakernel-bash < 0.19.1-24 - -%description -n python2-metakernel -A Jupyter/IPython kernel template which includes core magic functions -(including help, command and file path completion, parallel and -distributed processing, downloads, and much more). - -%package -n python2-metakernel-tests -Summary: Tests for python2-metakernel -%{?python_provide:%python_provide python2-metakernel-tests} -Requires: python2-metakernel = %{version}-%{release} -Requires: python2-metakernel-python -Requires: python2-pytest -Requires: python2-requests -Requires: python2-ipyparallel -Requires: python2-jedi -Requires: man - -%description -n python2-metakernel-tests -This package contains the tests of python2-metakernel. -%endif - %package -n python3-metakernel Summary: Metakernel for Jupyter %{?python_provide:%python_provide python3-metakernel} Requires: python3-ipykernel Requires: python3-pexpect >= 4.2 Obsoletes: python3-metakernel-bash < 0.19.1-24 -%if ! %{buildpy2} -Obsoletes: python2-metakernel < %{version}-%{release} -Obsoletes: python2-metakernel-bash < 0.19.1-24 -%endif %description -n python3-metakernel A Jupyter/IPython kernel template which includes core magic functions @@ -105,9 +56,6 @@ Requires: python3-requests Requires: python3-ipyparallel Requires: python3-jedi Requires: man -%if ! %{buildpy2} -Obsoletes: python2-metakernel-tests < %{version}-%{release} -%endif %description -n python3-metakernel-tests This package contains the tests of python3-metakernel. @@ -118,56 +66,25 @@ Summary: Documentation for python-metakernel %description doc This package contains the documentation of python-metakernel. -%if %{buildpy2} -%package -n python2-metakernel-python -Version: 0.19.1 -Release: 29%{?dist} -Summary: A Python kernel for Jupyter/IPython -%{?python_provide:%python_provide python2-metakernel-python} -Requires: python2-metakernel = %{pkgversion}-%{pkgrelease} -Requires: python2-jedi -Requires: python-jupyter-filesystem - -%description -n python2-metakernel-python -A Python kernel for Jupyter/IPython, based on MetaKernel. - -%package -n python2-metakernel-echo -Version: 0.19.1 -Release: 29%{?dist} -Summary: A simple echo kernel for Jupyter/IPython -%{?python_provide:%python_provide python2-metakernel-echo} -Requires: python2-metakernel = %{pkgversion}-%{pkgrelease} -Requires: python-jupyter-filesystem - -%description -n python2-metakernel-echo -A simple echo kernel for Jupyter/IPython, based on MetaKernel. -%endif - %package -n python3-metakernel-python Version: 0.19.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: A Python kernel for Jupyter/IPython %{?python_provide:%python_provide python3-metakernel-python} Requires: python3-metakernel = %{pkgversion}-%{pkgrelease} Requires: python3-jedi Requires: python-jupyter-filesystem -%if ! %{buildpy2} -Obsoletes: python2-metakernel-python < %{version}-%{release} -%endif %description -n python3-metakernel-python A Python kernel for Jupyter/IPython, based on MetaKernel. %package -n python3-metakernel-echo Version: 0.19.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: A simple echo kernel for Jupyter/IPython %{?python_provide:%python_provide python3-metakernel-echo} Requires: python3-metakernel = %{pkgversion}-%{pkgrelease} Requires: python-jupyter-filesystem -%if ! %{buildpy2} -Obsoletes: python2-metakernel-echo < %{version}-%{release} -%endif %description -n python3-metakernel-echo A simple echo kernel for Jupyter/IPython, based on MetaKernel. @@ -176,18 +93,6 @@ A simple echo kernel for Jupyter/IPython, based on MetaKernel. %setup -q -n metakernel-%{pkgversion} %build -%if %{buildpy2} -%py2_build - -pushd metakernel_python -%py2_build -popd - -pushd metakernel_echo -%py2_build -popd -%endif - %py3_build pushd metakernel_python @@ -204,29 +109,6 @@ rm -f _build/html/.buildinfo popd %install -%if %{buildpy2} -%py2_install - -pushd metakernel_python -%py2_install -popd - -pushd metakernel_echo -%py2_install -popd - -for f in tests/test_expect.py; do - sed '/\/usr\/bin\/env/d' -i %{buildroot}%{python2_sitelib}/metakernel/${f} -done - -PYTHONPATH=metakernel_python \ - python2 -m metakernel_python install --name python2-metakernel-python \ - --prefix %{buildroot}%{_prefix} -PYTHONPATH=metakernel_echo \ - python2 -m metakernel_echo install --name python2-metakernel-echo \ - --prefix %{buildroot}%{_prefix} -%endif - %py3_install pushd metakernel_python @@ -248,54 +130,14 @@ PYTHONPATH=metakernel_echo \ python3 -m metakernel_echo install --name python3-metakernel-echo \ --prefix %{buildroot}%{_prefix} -%if %{buildpy2} -# Distinguish display names for python 2 and python 3 based kernels -sed 's/MetaKernel [A-Za-z]*/& (Python 2)/' \ - -i %{buildroot}%{_datadir}/jupyter/kernels/python2-metakernel-*/kernel.json -sed 's/MetaKernel [A-Za-z]*/& (Python 3)/' \ - -i %{buildroot}%{_datadir}/jupyter/kernels/python3-metakernel-*/kernel.json -%endif - %check -%if %{buildpy2} -PYTHONPATH=metakernel_python ipcluster-2 start -n=3 & -pid=$! -pytest-2 -v metakernel -ipcluster-2 stop -wait $pid -rm -f ${HOME}/.ipython/metakernel/magics/*.pyc -%endif - -%if %{buildpy2} -ipcluster=ipcluster-3 -%else -ipcluster=ipcluster -%endif - -PYTHONPATH=metakernel_python ${ipcluster} start -n=3 & +PYTHONPATH=metakernel_python ipcluster start -n=3 & pid=$! pytest-3 -v metakernel -${ipcluster} stop +ipcluster stop wait $pid rm -f ${HOME}/.ipython/metakernel/magics/__pycache__/*.pyc -%if %{buildpy2} -%files -n python2-metakernel -%license LICENSE.txt -%doc README.rst -%{python2_sitelib}/metakernel-*.egg-info -%dir %{python2_sitelib}/metakernel -%{python2_sitelib}/metakernel/*.py* -%{python2_sitelib}/metakernel/images -%dir %{python2_sitelib}/metakernel/magics -%{python2_sitelib}/metakernel/magics/*.py* -%{python2_sitelib}/metakernel/utils - -%files -n python2-metakernel-tests -%{python2_sitelib}/metakernel/tests -%{python2_sitelib}/metakernel/magics/tests -%endif - %files -n python3-metakernel %license LICENSE.txt %doc README.rst @@ -317,18 +159,6 @@ rm -f ${HOME}/.ipython/metakernel/magics/__pycache__/*.pyc %license LICENSE.txt %doc docs/_build/html -%if %{buildpy2} -%files -n python2-metakernel-python -%{python2_sitelib}/metakernel_python-*.egg-info -%{python2_sitelib}/metakernel_python.py* -%{_datadir}/jupyter/kernels/python2-metakernel-python - -%files -n python2-metakernel-echo -%{python2_sitelib}/metakernel_echo-*.egg-info -%{python2_sitelib}/metakernel_echo.py* -%{_datadir}/jupyter/kernels/python2-metakernel-echo -%endif - %files -n python3-metakernel-python %{python3_sitelib}/metakernel_python-*.egg-info %{python3_sitelib}/metakernel_python.py @@ -342,6 +172,10 @@ rm -f ${HOME}/.ipython/metakernel/magics/__pycache__/*.pyc %{_datadir}/jupyter/kernels/python3-metakernel-echo %changelog +* Thu Apr 16 2020 Mattias Ellert - 0.24.4-1 +- Update to version 0.24.4 +- Remove Python 2 parts from the spec file (Fedora 29 is EOL) + * Thu Jan 30 2020 Fedora Release Engineering - 0.24.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 73049a9..b4ce076 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-metakernel-0.24.3.tar.gz) = 44d3b173a9c3dd5ba3519e209ac8150d3ef1e33ec2b9daa72a3ab5f542e598d8b65ca2c4f21523bf7f8a85036ddc966f89a7ee9954044725d3b763ec104819d4 +SHA512 (python-metakernel-0.24.4.tar.gz) = ec81a862b10b872af13fe2676eca90a7e5773d6ffe3ec8f0a823c7e9b8bb880c87359923a3ea7d7488c62623e2d3869bc585f3a01890ecef96712374672593d7