From 76a4883014f1986ba33e0fff7de8d86c12828130 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Jun 05 2019 07:53:55 +0000 Subject: Update to version 0.24.1 Drop metakernel-bash packages (upstream removed sources) Tests are now using pytest instead of nose Fix a TypeError --- diff --git a/python-metakernel-Fix-TypeError.patch b/python-metakernel-Fix-TypeError.patch new file mode 100644 index 0000000..fc89452 --- /dev/null +++ b/python-metakernel-Fix-TypeError.patch @@ -0,0 +1,25 @@ +From 7fb2aabfeb7633ffced8f0498e056dd607eab215 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Wed, 5 Jun 2019 07:16:34 +0200 +Subject: [PATCH] Fix TypeError + +--- + metakernel/_metakernel.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/metakernel/_metakernel.py b/metakernel/_metakernel.py +index c7a2392..b5b3490 100644 +--- a/metakernel/_metakernel.py ++++ b/metakernel/_metakernel.py +@@ -641,7 +641,7 @@ class MetaKernel(Kernel): + if Widget and isinstance(item, Widget): + self.Display(item) + +- objects = [i for i in objects if not isinstance(i, Widget)] ++ objects = [i for i in objects if not (Widget and isinstance(i, Widget))] + message = format_message(*objects, **kwargs) + + stream_content = { +-- +2.21.0 + diff --git a/python-metakernel.spec b/python-metakernel.spec index 5e3af87..5c6f352 100644 --- a/python-metakernel.spec +++ b/python-metakernel.spec @@ -10,7 +10,7 @@ Name: python-metakernel # and release numbers - update below in each package section # Running rpmdev-bumpspec on this specfile will update all the # release tags automatically -Version: 0.23.0 +Version: 0.24.1 Release: 1%{?dist} %global pkgversion %{version} %global pkgrelease %{release} @@ -19,6 +19,8 @@ Summary: Metakernel for Jupyter License: BSD URL: https://github.com/Calysto/metakernel Source0: https://github.com/Calysto/metakernel/archive/v%{version}/%{name}-%{version}.tar.gz +# https://github.com/Calysto/metakernel/pull/192 +Patch0: %{name}-Fix-TypeError.patch BuildArch: noarch %if %{buildpy2} @@ -26,7 +28,8 @@ BuildRequires: python2-devel BuildRequires: python2-ipykernel BuildRequires: python2-pexpect >= 4.2 # For testing: -BuildRequires: python2-nose +BuildRequires: python2-pytest +BuildRequires: python2-requests BuildRequires: python2-ipyparallel BuildRequires: python2-jedi %endif @@ -34,7 +37,8 @@ BuildRequires: python3-devel BuildRequires: python3-ipykernel BuildRequires: python3-pexpect >= 4.2 # For testing: -BuildRequires: python3-nose +BuildRequires: python3-pytest +BuildRequires: python3-requests BuildRequires: python3-ipyparallel BuildRequires: python3-jedi BuildRequires: man @@ -55,6 +59,7 @@ 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 @@ -66,7 +71,8 @@ Summary: Tests for python2-metakernel %{?python_provide:%python_provide python2-metakernel-tests} Requires: python2-metakernel = %{version}-%{release} Requires: python2-metakernel-python -Requires: python2-nose +Requires: python2-pytest +Requires: python2-requests Requires: python2-ipyparallel Requires: python2-jedi Requires: man @@ -80,8 +86,10 @@ 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 @@ -94,7 +102,8 @@ Summary: Tests for python3-metakernel %{?python_provide:%python_provide python3-metakernel-tests} Requires: python3-metakernel = %{version}-%{release} Requires: python3-metakernel-python -Requires: python3-nose +Requires: python3-pytest +Requires: python3-requests Requires: python3-ipyparallel Requires: python3-jedi Requires: man @@ -114,7 +123,7 @@ This package contains the documentation of python-metakernel. %if %{buildpy2} %package -n python2-metakernel-python Version: 0.19.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A Python kernel for Jupyter/IPython %{?python_provide:%python_provide python2-metakernel-python} Requires: python2-metakernel = %{pkgversion}-%{pkgrelease} @@ -126,7 +135,7 @@ A Python kernel for Jupyter/IPython, based on MetaKernel. %package -n python2-metakernel-echo Version: 0.19.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A simple echo kernel for Jupyter/IPython %{?python_provide:%python_provide python2-metakernel-echo} Requires: python2-metakernel = %{pkgversion}-%{pkgrelease} @@ -134,22 +143,11 @@ Requires: python-jupyter-filesystem %description -n python2-metakernel-echo A simple echo kernel for Jupyter/IPython, based on MetaKernel. - -%package -n python2-metakernel-bash -Version: 0.19.1 -Release: 23%{?dist} -Summary: A Bash kernel for Jupyter/IPython -%{?python_provide:%python_provide python2-metakernel-bash} -Requires: python2-metakernel = %{pkgversion}-%{pkgrelease} -Requires: python-jupyter-filesystem - -%description -n python2-metakernel-bash -A Bash kernel for Jupyter/IPython, based on MetaKernel. %endif %package -n python3-metakernel-python Version: 0.19.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A Python kernel for Jupyter/IPython %{?python_provide:%python_provide python3-metakernel-python} Requires: python3-metakernel = %{pkgversion}-%{pkgrelease} @@ -164,7 +162,7 @@ A Python kernel for Jupyter/IPython, based on MetaKernel. %package -n python3-metakernel-echo Version: 0.19.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A simple echo kernel for Jupyter/IPython %{?python_provide:%python_provide python3-metakernel-echo} Requires: python3-metakernel = %{pkgversion}-%{pkgrelease} @@ -176,22 +174,9 @@ Obsoletes: python2-metakernel-echo < %{version}-%{release} %description -n python3-metakernel-echo A simple echo kernel for Jupyter/IPython, based on MetaKernel. -%package -n python3-metakernel-bash -Version: 0.19.1 -Release: 23%{?dist} -Summary: A Bash kernel for Jupyter/IPython -%{?python_provide:%python_provide python3-metakernel-bash} -Requires: python3-metakernel = %{pkgversion}-%{pkgrelease} -Requires: python-jupyter-filesystem -%if ! %{buildpy2} -Obsoletes: python2-metakernel-bash < %{version}-%{release} -%endif - -%description -n python3-metakernel-bash -A Bash kernel for Jupyter/IPython, based on MetaKernel. - %prep %setup -q -n metakernel-%{pkgversion} +%patch0 -p1 %build %if %{buildpy2} @@ -204,10 +189,6 @@ popd pushd metakernel_echo %py2_build popd - -pushd metakernel_bash -%py2_build -popd %endif %py3_build @@ -220,10 +201,6 @@ pushd metakernel_echo %py3_build popd -pushd metakernel_bash -%py3_build -popd - pushd docs PYTHONPATH=.. make html SPHINXBUILD=sphinx-build-3 rm -f _build/html/.buildinfo @@ -241,11 +218,7 @@ pushd metakernel_echo %py2_install popd -pushd metakernel_bash -%py2_install -popd - -for f in tests/test_expect.py tests/_echo_wait.py; do +for f in tests/test_expect.py; do sed '/\/usr\/bin\/env/d' -i %{buildroot}%{python2_sitelib}/metakernel/${f} done @@ -255,9 +228,6 @@ PYTHONPATH=metakernel_python \ PYTHONPATH=metakernel_echo \ python2 -m metakernel_echo install --name python2-metakernel-echo \ --prefix %{buildroot}%{_prefix} -PYTHONPATH=metakernel_bash \ - python2 -m metakernel_bash install --name python2-metakernel-bash \ - --prefix %{buildroot}%{_prefix} %endif %py3_install @@ -270,11 +240,7 @@ pushd metakernel_echo %py3_install popd -pushd metakernel_bash -%py3_install -popd - -for f in tests/test_expect.py tests/_echo_wait.py; do +for f in tests/test_expect.py; do sed '/\/usr\/bin\/env/d' -i %{buildroot}%{python3_sitelib}/metakernel/${f} done @@ -284,9 +250,6 @@ PYTHONPATH=metakernel_python \ PYTHONPATH=metakernel_echo \ python3 -m metakernel_echo install --name python3-metakernel-echo \ --prefix %{buildroot}%{_prefix} -PYTHONPATH=metakernel_bash \ - python3 -m metakernel_bash install --name python3-metakernel-bash \ - --prefix %{buildroot}%{_prefix} %if %{buildpy2} # Distinguish display names for python 2 and python 3 based kernels @@ -300,7 +263,7 @@ sed 's/MetaKernel [A-Za-z]*/& (Python 3)/' \ %if %{buildpy2} PYTHONPATH=metakernel_python ipcluster-2 start -n=3 & pid=$! -nosetests-2 -v -a !network +pytest-2 -v metakernel ipcluster-2 stop wait $pid rm -f ${HOME}/.ipython/metakernel/magics/*.pyc @@ -314,7 +277,7 @@ ipcluster=ipcluster PYTHONPATH=metakernel_python ${ipcluster} start -n=3 & pid=$! -nosetests-3 -v -a !network +pytest-3 -v metakernel ${ipcluster} stop wait $pid rm -f ${HOME}/.ipython/metakernel/magics/__pycache__/*.pyc @@ -367,11 +330,6 @@ rm -f ${HOME}/.ipython/metakernel/magics/__pycache__/*.pyc %{python2_sitelib}/metakernel_echo-*.egg-info %{python2_sitelib}/metakernel_echo.py* %{_datadir}/jupyter/kernels/python2-metakernel-echo - -%files -n python2-metakernel-bash -%{python2_sitelib}/metakernel_bash-*.egg-info -%{python2_sitelib}/metakernel_bash.py* -%{_datadir}/jupyter/kernels/python2-metakernel-bash %endif %files -n python3-metakernel-python @@ -386,13 +344,13 @@ rm -f ${HOME}/.ipython/metakernel/magics/__pycache__/*.pyc %{python3_sitelib}/__pycache__/metakernel_echo.* %{_datadir}/jupyter/kernels/python3-metakernel-echo -%files -n python3-metakernel-bash -%{python3_sitelib}/metakernel_bash-*.egg-info -%{python3_sitelib}/metakernel_bash.py -%{python3_sitelib}/__pycache__/metakernel_bash.* -%{_datadir}/jupyter/kernels/python3-metakernel-bash - %changelog +* Wed Jun 05 2019 Mattias Ellert - 0.24.1-1 +- Update to version 0.24.1 +- Drop metakernel-bash packages (upstream removed sources) +- Tests are now using pytest instead of nose +- Fix a TypeError + * Mon May 13 2019 Mattias Ellert - 0.23.0-1 - Update to version 0.23.0 diff --git a/sources b/sources index 2c3a4ec..cd45457 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-metakernel-0.23.0.tar.gz) = 9bc367b41cb3bb94d81be179ad69c4bfdc5554936f4ca574ba04d15d77275aba9f1ad7b88cec2a89bb7657b1121a37cb1dfab116c332b701d23dffce2a97190a +SHA512 (python-metakernel-0.24.1.tar.gz) = 8bfc3748ccbbaed981e87f6eb3ecd66599628ed48676d017201a43ec31f5a7bb236de9bc3b79d6217d236839c369e94e62ae2fe9270550a15a07224cf3d6b348