From feba6ef13d297afde9959704e1a93323d9b81961 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Wed, 5 Feb 2014 09:40:44 +0100 Subject: [PATCH 01/32] update to 1.1.0 - drop both patches (upstream) - add python-ipython-sphinx packages --- ipython.spec | 95 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 67 insertions(+), 28 deletions(-) diff --git a/ipython.spec b/ipython.spec index 5b096bd..aa59379 100644 --- a/ipython.spec +++ b/ipython.spec @@ -15,8 +15,8 @@ %endif Name: ipython -Version: 0.13.2 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: An enhanced interactive Python shell Group: Development/Libraries @@ -26,11 +26,6 @@ Group: Development/Libraries License: (BSD and MIT and Python) and GPLv2+ URL: http://ipython.org/ Source0: http://archive.ipython.org/release/%{version}/%{name}-%{version}.tar.gz -# will be in ipython-0.14 -# https://github.com/ipython/ipython/pull/2681 -Patch0: ipython-0.13.1-dont-require-matplotlib.patch -# From upstream's git -Patch1: ipython-0.13.2-print-syntax.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -134,6 +129,16 @@ Requires: python-setuptools This package provides IPython for in a terminal. +%package -n python-ipython-sphinx +Summary: Sphinx directive to support embedded IPython code +Requires: python-ipython-console = %{version}-%{release} +Requires: python-sphinx + +%description -n python-ipython-sphinx +%{ipython_desc_base} + +This package contains the ipython sphinx extension. + %package -n python-ipython-notebook Summary: An enhanced interactive Python notebook Requires: python-ipython-console = %{version}-%{release} @@ -212,6 +217,16 @@ Requires: python3-setuptools This package provides IPython for in a terminal. +%package -n python3-ipython-sphinx +Summary: Sphinx directive to support embedded IPython code +Requires: python3-ipython-console = %{version}-%{release} +Requires: python3-sphinx + +%description -n python3-ipython-sphinx +%{ipython_desc_base} + +This package contains the ipython sphinx extension. + %package -n python3-ipython-notebook Summary: An enhanced interactive Python notebook @@ -258,8 +273,7 @@ This package contains the gui of %{name}, which requires PyQt. %prep %setup -q -%patch0 -p 1 -%patch1 -p 1 +# Patches go here # delete bundling libs pushd IPython/external @@ -412,6 +426,9 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %{python_sitelib}/IPython/*.py* %dir %{python_sitelib}/IPython/kernel %{python_sitelib}/IPython/kernel/*.py* +%{python_sitelib}/IPython/kernel/blocking/ +%{python_sitelib}/IPython/kernel/inprocess/ +%{python_sitelib}/IPython/kernel/ioloop/ %dir %{python_sitelib}/IPython/testing %{python_sitelib}/IPython/testing/*.py* %{python_sitelib}/IPython/testing/plugin @@ -420,23 +437,30 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %{python_sitelib}/IPython/config/ %{python_sitelib}/IPython/core/ %{python_sitelib}/IPython/extensions/ -%dir %{python_sitelib}/IPython/frontend/ -%{python_sitelib}/IPython/frontend/terminal/ -%{python_sitelib}/IPython/frontend/__init__.py* -%{python_sitelib}/IPython/frontend/consoleapp.py* +#%dir %{python_sitelib}/IPython/frontend/ +#%{python_sitelib}/IPython/frontend/terminal/ +#%{python_sitelib}/IPython/frontend/__init__.py* +#%{python_sitelib}/IPython/frontend/consoleapp.py* %{python_sitelib}/IPython/lib/ %{python_sitelib}/IPython/nbformat/ +%{python_sitelib}/IPython/nbconvert/ %{python_sitelib}/IPython/parallel/ %{python_sitelib}/IPython/scripts/ +%{python_sitelib}/IPython/terminal/ %{python_sitelib}/IPython/utils/ -%{python_sitelib}/IPython/zmq/ -%exclude %{python_sitelib}/IPython/zmq/gui/ +%{python_sitelib}/IPython/kernel/zmq/ +%exclude %{python_sitelib}/IPython/kernel/zmq/gui/ # tests go into subpackage %exclude %{python_sitelib}/IPython/*/tests/ %exclude %{python_sitelib}/IPython/*/*/tests +%files -n python-ipython-sphinx +%defattr(-,root,root,-) +%{python_sitelib}/IPython/sphinxext/ + + %files -n python-ipython-tests %defattr(-,root,root,-) %{_bindir}/iptest @@ -452,13 +476,13 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %files -n python-ipython-notebook %defattr(-,root,root,-) -%{python_sitelib}/IPython/frontend/html/ +%{python_sitelib}/IPython/html/ %files -n python-ipython-gui %defattr(-,root,root,-) -%{python_sitelib}/IPython/zmq/gui -%{python_sitelib}/IPython/frontend/qt/ +%{python_sitelib}/IPython/kernel/zmq/gui +%{python_sitelib}/IPython/qt/ %if 0%{?with_python3} %files -n python3-ipython @@ -488,6 +512,9 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %dir %{python3_sitelib}/IPython/kernel %{python3_sitelib}/IPython/kernel/__pycache__/ %{python3_sitelib}/IPython/kernel/*.py* +%{python3_sitelib}/IPython/kernel/blocking/ +%{python3_sitelib}/IPython/kernel/inprocess/ +%{python3_sitelib}/IPython/kernel/ioloop/ %dir %{python3_sitelib}/IPython/testing %{python3_sitelib}/IPython/testing/__pycache__/ %{python3_sitelib}/IPython/testing/*.py* @@ -497,24 +524,31 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %{python3_sitelib}/IPython/config/ %{python3_sitelib}/IPython/core/ %{python3_sitelib}/IPython/extensions/ -%dir %{python3_sitelib}/IPython/frontend/ -%{python3_sitelib}/IPython/frontend/terminal/ -%{python3_sitelib}/IPython/frontend/__pycache__/ -%{python3_sitelib}/IPython/frontend/__init__.py* -%{python3_sitelib}/IPython/frontend/consoleapp.py* +#%dir %{python3_sitelib}/IPython/frontend/ +#%{python3_sitelib}/IPython/frontend/terminal/ +#%{python3_sitelib}/IPython/frontend/__pycache__/ +#%{python3_sitelib}/IPython/frontend/__init__.py* +#%{python3_sitelib}/IPython/frontend/consoleapp.py* %{python3_sitelib}/IPython/lib/ %{python3_sitelib}/IPython/nbformat/ +%{python3_sitelib}/IPython/nbconvert/ %{python3_sitelib}/IPython/parallel/ %{python3_sitelib}/IPython/scripts/ +%{python3_sitelib}/IPython/terminal/ %{python3_sitelib}/IPython/utils/ -%{python3_sitelib}/IPython/zmq/ -%exclude %{python3_sitelib}/IPython/zmq/gui/ +%{python3_sitelib}/IPython/kernel/zmq/ +%exclude %{python3_sitelib}/IPython/kernel/zmq/gui/ # tests go into subpackage %exclude %{python3_sitelib}/IPython/*/tests/ %exclude %{python3_sitelib}/IPython/*/*/tests +%files -n python3-ipython-sphinx +%defattr(-,root,root,-) +%{python3_sitelib}/IPython/sphinxext/ + + %files -n python3-ipython-tests %defattr(-,root,root,-) %{_bindir}/iptest3 @@ -530,16 +564,21 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %files -n python3-ipython-notebook %defattr(-,root,root,-) -%{python3_sitelib}/IPython/frontend/html/ +%{python3_sitelib}/IPython/html/ %files -n python3-ipython-gui %defattr(-,root,root,-) -%{python3_sitelib}/IPython/zmq/gui -%{python3_sitelib}/IPython/frontend/qt/ +%{python3_sitelib}/IPython/kernel/zmq/gui +%{python3_sitelib}/IPython/qt/ %endif # with_python3 %changelog +* Wed Feb 5 2014 Thomas Spura - 1.1.0-1 +- update to 1.1.0 +- drop both patches (upstream) +- add python-ipython-sphinx packages + * Mon Oct 7 2013 Thomas Spura - 0.13.2-3 - install into unversioned docdir (#993848) - R on setuptools for starting with pkg_resources (#994673) From 06476865ed8d2d0a591131a6fbd21460983739af Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Wed, 5 Feb 2014 09:41:30 +0100 Subject: [PATCH 02/32] remove %%defattr --- ipython.spec | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/ipython.spec b/ipython.spec index aa59379..7c6f4bb 100644 --- a/ipython.spec +++ b/ipython.spec @@ -403,10 +403,8 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %endif %files -n python-ipython -%defattr(-,root,root,-) %files -n python-ipython-console -%defattr(-,root,root,-) %{_bindir}/ipython %{_bindir}/irunner %{_bindir}/pycolor @@ -457,39 +455,32 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %files -n python-ipython-sphinx -%defattr(-,root,root,-) %{python_sitelib}/IPython/sphinxext/ %files -n python-ipython-tests -%defattr(-,root,root,-) %{_bindir}/iptest %{python_sitelib}/IPython/*/tests %{python_sitelib}/IPython/*/*/tests %files -n python-ipython-doc -%defattr(-,root,root,-) # ipython installs its own documentation, but we need to own the directory %{_datadir}/doc/%{name} %files -n python-ipython-notebook -%defattr(-,root,root,-) %{python_sitelib}/IPython/html/ %files -n python-ipython-gui -%defattr(-,root,root,-) %{python_sitelib}/IPython/kernel/zmq/gui %{python_sitelib}/IPython/qt/ %if 0%{?with_python3} %files -n python3-ipython -%defattr(-,root,root,-) %files -n python3-ipython-console -%defattr(-,root,root,-) %{_bindir}/ipython3 %{_bindir}/irunner3 %{_bindir}/pycolor3 @@ -545,30 +536,25 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %files -n python3-ipython-sphinx -%defattr(-,root,root,-) %{python3_sitelib}/IPython/sphinxext/ %files -n python3-ipython-tests -%defattr(-,root,root,-) %{_bindir}/iptest3 %{python3_sitelib}/IPython/*/tests %{python3_sitelib}/IPython/*/*/tests ##%files -n python3-ipython-doc -##%defattr(-,root,root,-) # ipython installs its own documentation, but we need to own the directory ##%{_datadir}/doc/python3-%{name}-%{version} %files -n python3-ipython-notebook -%defattr(-,root,root,-) %{python3_sitelib}/IPython/html/ %files -n python3-ipython-gui -%defattr(-,root,root,-) %{python3_sitelib}/IPython/kernel/zmq/gui %{python3_sitelib}/IPython/qt/ %endif # with_python3 @@ -578,6 +564,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ - update to 1.1.0 - drop both patches (upstream) - add python-ipython-sphinx packages +- remove %%defattr * Mon Oct 7 2013 Thomas Spura - 0.13.2-3 - install into unversioned docdir (#993848) From e94744c7940e6d239386984fd2f1320cc5c50b67 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Wed, 5 Feb 2014 09:43:45 +0100 Subject: [PATCH 03/32] Add ending slash to doc directory --- ipython.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipython.spec b/ipython.spec index 7c6f4bb..15e5a67 100644 --- a/ipython.spec +++ b/ipython.spec @@ -466,7 +466,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %files -n python-ipython-doc # ipython installs its own documentation, but we need to own the directory -%{_datadir}/doc/%{name} +%{_datadir}/doc/%{name}/ %files -n python-ipython-notebook @@ -547,7 +547,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ ##%files -n python3-ipython-doc # ipython installs its own documentation, but we need to own the directory -##%{_datadir}/doc/python3-%{name}-%{version} +##%{_datadir}/doc/python3-%{name}/ %files -n python3-ipython-notebook From 94e35d059f7728c24d668c42a405e1240c437139 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Wed, 5 Feb 2014 09:58:17 +0100 Subject: [PATCH 04/32] Try to build docs (currently fails with an ascii error) --- ipython.spec | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/ipython.spec b/ipython.spec index 15e5a67..0be1bae 100644 --- a/ipython.spec +++ b/ipython.spec @@ -2,7 +2,8 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %endif -%bcond_without run_testsuite +%bcond_without check +%bcond_without doc # where are all the python3 dependencies %if 0%{?fedora} > 15 @@ -33,7 +34,10 @@ BuildArch: noarch BuildRequires: python-devel BuildRequires: python-simplegeneric -%if %{with run_testsuite} +%if %{with doc} +%endif + +%if %{with check} # for checking/testing BuildRequires: python-nose BuildRequires: python-simplegeneric @@ -164,6 +168,8 @@ Obsoletes: ipython-tests < 0.13-1 This package contains the tests of %{name}. You can check this way, if ipython works on your platform. + +%if %{with doc} %package -n python-ipython-doc Summary: Documentation for %{name} Group: Documentation @@ -171,6 +177,7 @@ Provides: ipython-doc = %{version}-%{release} Obsoletes: ipython-doc < 0.13-1 %description -n python-ipython-doc This package contains the documentation of %{name}. +%endif %package -n python-ipython-gui @@ -317,6 +324,19 @@ popd %{__python} setup.py build +%if %{with doc} +cd docs +## TODO: fails with +##reading sources... [ 71%] api/generated/IPython.utils.io +##Sphinx error: +##'ascii' codec can't encode character u'\u0142' in position 204: ordinal not in range(128) +##make: *** [html] Error 1 +#make html +mkdir -p build/html/ +cd .. +%endif + + %install rm -rf %{buildroot} %if 0%{?with_python3} @@ -332,7 +352,7 @@ popd rm -rf %{buildroot} -%if %{with run_testsuite} +%if %{with check} %check # Ensure that the user's .pythonrc.py is not invoked during any tests. export PYTHONSTARTUP="" @@ -464,9 +484,10 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %{python_sitelib}/IPython/*/*/tests +%if %{with doc} %files -n python-ipython-doc -# ipython installs its own documentation, but we need to own the directory -%{_datadir}/doc/%{name}/ +%doc docs/build/html +%endif %files -n python-ipython-notebook @@ -545,9 +566,11 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %{python3_sitelib}/IPython/*/*/tests +%if %{with doc} ##%files -n python3-ipython-doc # ipython installs its own documentation, but we need to own the directory ##%{_datadir}/doc/python3-%{name}/ +%endif %files -n python3-ipython-notebook @@ -565,6 +588,8 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ - drop both patches (upstream) - add python-ipython-sphinx packages - remove %%defattr +- rename run_testsuite to check +- building docs (currently fails with an ascii error) * Mon Oct 7 2013 Thomas Spura - 0.13.2-3 - install into unversioned docdir (#993848) From 6b7f486f9c2db97fadd46f5199c2f3b9f2fb07d8 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Wed, 5 Feb 2014 10:09:59 +0100 Subject: [PATCH 05/32] Unbundle jsonschema --- ipython.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ipython.spec b/ipython.spec index 0be1bae..2d7e594 100644 --- a/ipython.spec +++ b/ipython.spec @@ -33,6 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-simplegeneric +BuildRequires: python-jsonschema %if %{with doc} %endif @@ -65,6 +66,7 @@ BuildRequires: python3-devel BuildRequires: python3-nose BuildRequires: python3-mglob BuildRequires: python3-simplegeneric +BuildRequires: python3-jsonschema # "Tools and libraries available at test time:" BuildRequires: python3-zmq BuildRequires: python3-zmq-tests @@ -124,6 +126,7 @@ Requires: python-zmq Requires: pexpect Requires: python-mglob Requires: python-simplegeneric +Requires: python-jsonschema #For starting ipython from pkg_resources Requires: python-setuptools @@ -215,6 +218,7 @@ Requires: python3-zmq Requires: python3-pexpect Requires: python3-mglob Requires: python3-simplegeneric +Requires: python3-jsonschema #For starting ipython from pkg_resources Requires: python3-setuptools @@ -292,6 +296,7 @@ rm decorators/_decorators.py # other packages exist in fedora rm simplegeneric/_simplegeneric.py +rm jsonschema/_jsonschema.py %if ! 0%{?with_python3} # bundle this on python3 in experimental version for now rm pexpect/_pexpect.py @@ -590,6 +595,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ - remove %%defattr - rename run_testsuite to check - building docs (currently fails with an ascii error) +- unbundle jsonschema * Mon Oct 7 2013 Thomas Spura - 0.13.2-3 - install into unversioned docdir (#993848) From f20c998efd386f8d1637533cc4ec33583e8a63bc Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Wed, 5 Feb 2014 10:36:18 +0100 Subject: [PATCH 06/32] Waiting for python3 support of jsonpointer --- ipython.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ipython.spec b/ipython.spec index 2d7e594..014fd59 100644 --- a/ipython.spec +++ b/ipython.spec @@ -297,6 +297,8 @@ rm decorators/_decorators.py # other packages exist in fedora rm simplegeneric/_simplegeneric.py rm jsonschema/_jsonschema.py +#WAITFOR python3 support #1061622 +#rm jsonpointer/_jsonpointer.py %if ! 0%{?with_python3} # bundle this on python3 in experimental version for now rm pexpect/_pexpect.py From a3d7775da23740916deda5bfbe88d6e10a707a84 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Wed, 5 Feb 2014 10:39:52 +0100 Subject: [PATCH 07/32] Always unbundle pexpect --- ipython.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ipython.spec b/ipython.spec index 014fd59..139e7f4 100644 --- a/ipython.spec +++ b/ipython.spec @@ -291,25 +291,21 @@ pushd IPython/external # python's own modules rm argparse/_argparse.py +# rm decorator/_decorator.py + # use decorators of numpy rm decorators/_decorators.py -# other packages exist in fedora -rm simplegeneric/_simplegeneric.py rm jsonschema/_jsonschema.py #WAITFOR python3 support #1061622 #rm jsonpointer/_jsonpointer.py -%if ! 0%{?with_python3} -# bundle this on python3 in experimental version for now rm pexpect/_pexpect.py -%endif - -# rejected in a PEP, probably no upstream -#rm Itpl/_Itpl.py # available at pypi #rm path/_path.py +rm simplegeneric/_simplegeneric.py + # ssh modules from paramiko popd From baf70d9c37c5f6d47d48b7ce6e83886b6a37de8a Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Wed, 5 Feb 2014 10:50:19 +0100 Subject: [PATCH 08/32] unbundle decorator --- ipython.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ipython.spec b/ipython.spec index 139e7f4..f4b38d3 100644 --- a/ipython.spec +++ b/ipython.spec @@ -33,6 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-simplegeneric +BuildRequires: python-decorator BuildRequires: python-jsonschema %if %{with doc} @@ -66,6 +67,7 @@ BuildRequires: python3-devel BuildRequires: python3-nose BuildRequires: python3-mglob BuildRequires: python3-simplegeneric +BuildRequires: python3-decorator BuildRequires: python3-jsonschema # "Tools and libraries available at test time:" BuildRequires: python3-zmq @@ -126,6 +128,7 @@ Requires: python-zmq Requires: pexpect Requires: python-mglob Requires: python-simplegeneric +Requires: python-decorator Requires: python-jsonschema #For starting ipython from pkg_resources @@ -218,6 +221,7 @@ Requires: python3-zmq Requires: python3-pexpect Requires: python3-mglob Requires: python3-simplegeneric +Requires: python3-decorator Requires: python3-jsonschema #For starting ipython from pkg_resources @@ -291,7 +295,7 @@ pushd IPython/external # python's own modules rm argparse/_argparse.py -# rm decorator/_decorator.py +rm decorator/_decorator.py # use decorators of numpy rm decorators/_decorators.py @@ -594,6 +598,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ - rename run_testsuite to check - building docs (currently fails with an ascii error) - unbundle jsonschema +- unbundle decorator * Mon Oct 7 2013 Thomas Spura - 0.13.2-3 - install into unversioned docdir (#993848) From 3435d2a872db19152eccbbc186e3f5de1465b425 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Wed, 5 Feb 2014 10:54:02 +0100 Subject: [PATCH 09/32] Add bug number of python-path unbundling effort --- ipython.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipython.spec b/ipython.spec index f4b38d3..6628657 100644 --- a/ipython.spec +++ b/ipython.spec @@ -305,7 +305,7 @@ rm jsonschema/_jsonschema.py #rm jsonpointer/_jsonpointer.py rm pexpect/_pexpect.py -# available at pypi +#WAITFOR python3 support #1016466 #rm path/_path.py rm simplegeneric/_simplegeneric.py From 1ac0a7bf6a770f6857af38428bc46b1bb1a42ade Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Thu, 3 Apr 2014 14:23:57 +0200 Subject: [PATCH 10/32] ls IPython/external in build --- ipython.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ipython.spec b/ipython.spec index 6628657..67e505d 100644 --- a/ipython.spec +++ b/ipython.spec @@ -292,6 +292,8 @@ This package contains the gui of %{name}, which requires PyQt. # delete bundling libs pushd IPython/external +ls -l +ls -l * # python's own modules rm argparse/_argparse.py From 07ef55a8fc47762fe27321ed6b346c38cda4512d Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Thu, 3 Apr 2014 14:26:41 +0200 Subject: [PATCH 11/32] Update to 2.0.0 --- ipython.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ipython.spec b/ipython.spec index 67e505d..b7b8069 100644 --- a/ipython.spec +++ b/ipython.spec @@ -16,7 +16,7 @@ %endif Name: ipython -Version: 1.1.0 +Version: 2.0.0 Release: 1%{?dist} Summary: An enhanced interactive Python shell @@ -294,8 +294,6 @@ This package contains the gui of %{name}, which requires PyQt. pushd IPython/external ls -l ls -l * -# python's own modules -rm argparse/_argparse.py rm decorator/_decorator.py @@ -592,6 +590,10 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %endif # with_python3 %changelog +* Thu Apr 3 2014 Thomas Spura - 2.0.0-1 +- update to 2.0.0 +- bundled argparse has been dropped + * Wed Feb 5 2014 Thomas Spura - 1.1.0-1 - update to 1.1.0 - drop both patches (upstream) From db692bb4d9d6672b89bfa56dd3817fdca2f073a3 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Thu, 3 Apr 2014 14:40:28 +0200 Subject: [PATCH 12/32] unbundle fontawesome-fonts --- ipython.spec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/ipython.spec b/ipython.spec index b7b8069..3666978 100644 --- a/ipython.spec +++ b/ipython.spec @@ -249,6 +249,12 @@ Requires: python3-ipython-console = %{version}-%{release} Requires: python3-tornado Requires: python3-matplotlib +################################################# +### Bundled stuff from the notebook goes here ### +################################################# +BuildRequires: fontawesome-fonts-web +Requires: fontawesome-fonts-web + %description -n python3-ipython-notebook %{ipython_desc_base} @@ -314,6 +320,22 @@ rm simplegeneric/_simplegeneric.py popd +# unbundle components +pushd IPython/html/static/components + pushd font-awesome + rm -rf font + ln -s %{_datadir}/fonts/fontawesome font + for folder in css less scss; do + rm -rf $folder + ln -s %{_datadir}/font-awesome-*/${folder} + done + ls -l + popd +ls -l +ls -l * +asdf +popd + %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -593,6 +615,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ * Thu Apr 3 2014 Thomas Spura - 2.0.0-1 - update to 2.0.0 - bundled argparse has been dropped +- unbundle fontawesome-fonts{,-web} * Wed Feb 5 2014 Thomas Spura - 1.1.0-1 - update to 1.1.0 From 8aaaaf80102812921000a6d4d905fdf2b66f9b85 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Thu, 3 Apr 2014 14:48:29 +0200 Subject: [PATCH 13/32] Unbundle nodejs-requirejs --- ipython.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ipython.spec b/ipython.spec index 3666978..2d88e30 100644 --- a/ipython.spec +++ b/ipython.spec @@ -252,8 +252,14 @@ Requires: python3-matplotlib ################################################# ### Bundled stuff from the notebook goes here ### ################################################# +# We need to know nodejs_sitearch and lib +BuildRequires: nodejs-packaging + BuildRequires: fontawesome-fonts-web Requires: fontawesome-fonts-web +BuildRequires: nodejs-requirejs +Requires: nodejs-requirejs + %description -n python3-ipython-notebook %{ipython_desc_base} @@ -331,6 +337,10 @@ pushd IPython/html/static/components done ls -l popd + for folder in requirejs; do + rm -r ${folder} + ln -s %{nodejs_sitelib}/${folder} + done ls -l ls -l * asdf @@ -616,6 +626,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ - update to 2.0.0 - bundled argparse has been dropped - unbundle fontawesome-fonts{,-web} +- unbundle nodejs-requirejs * Wed Feb 5 2014 Thomas Spura - 1.1.0-1 - update to 1.1.0 From 5e5d7dc3fb7388e8df67d53daab2d1287263f56e Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Thu, 3 Apr 2014 15:19:47 +0200 Subject: [PATCH 14/32] Unbundle underscore and highlight-js --- ipython.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ipython.spec b/ipython.spec index 2d88e30..a7fc4e7 100644 --- a/ipython.spec +++ b/ipython.spec @@ -259,6 +259,10 @@ BuildRequires: fontawesome-fonts-web Requires: fontawesome-fonts-web BuildRequires: nodejs-requirejs Requires: nodejs-requirejs +BuildRequires: nodejs-underscore +Requires: nodejs-underscore +BuildRequires: nodejs-highlight-js +Requires: nodejs-highlight-js %description -n python3-ipython-notebook @@ -337,7 +341,8 @@ pushd IPython/html/static/components done ls -l popd - for folder in requirejs; do +# TODO backbone bootstrap google-caja jquery jquery-ui marked + for folder in highlight.js requirejs underscore; do rm -r ${folder} ln -s %{nodejs_sitelib}/${folder} done @@ -627,6 +632,8 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ - bundled argparse has been dropped - unbundle fontawesome-fonts{,-web} - unbundle nodejs-requirejs +- unbundle nodejs-underscore +- unbundle nodejs-highlight-js * Wed Feb 5 2014 Thomas Spura - 1.1.0-1 - update to 1.1.0 From 8cd467d6209347599c54d0033d20afc72b2d85da Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Tue, 22 Apr 2014 09:15:06 +0200 Subject: [PATCH 15/32] add BR/R on python-path --- ipython.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ipython.spec b/ipython.spec index a7fc4e7..e9a3d2c 100644 --- a/ipython.spec +++ b/ipython.spec @@ -35,6 +35,7 @@ BuildRequires: python-devel BuildRequires: python-simplegeneric BuildRequires: python-decorator BuildRequires: python-jsonschema +BuildRequires: python-path %if %{with doc} %endif @@ -66,6 +67,7 @@ BuildRequires: python3-devel # for checking/testing BuildRequires: python3-nose BuildRequires: python3-mglob +#BuildRequires: python3-path BuildRequires: python3-simplegeneric BuildRequires: python3-decorator BuildRequires: python3-jsonschema @@ -127,6 +129,7 @@ Requires: python-zmq #bundled libs Requires: pexpect Requires: python-mglob +Requires: python-path Requires: python-simplegeneric Requires: python-decorator Requires: python-jsonschema @@ -220,6 +223,7 @@ Requires: python3-zmq #bundled libs Requires: python3-pexpect Requires: python3-mglob +#Requires: python3-path Requires: python3-simplegeneric Requires: python3-decorator Requires: python3-jsonschema @@ -627,6 +631,9 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %endif # with_python3 %changelog +* Tue Apr 22 2014 Thomas Spura - 2.0.0-2 +- add BR/R python-path + * Thu Apr 3 2014 Thomas Spura - 2.0.0-1 - update to 2.0.0 - bundled argparse has been dropped From 20a0a53595413bc7e75fecf0a8777bd082375db0 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Tue, 22 Apr 2014 09:15:47 +0200 Subject: [PATCH 16/32] fix python -> python3 sed replacement --- ipython.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ipython.spec b/ipython.spec index e9a3d2c..732f247 100644 --- a/ipython.spec +++ b/ipython.spec @@ -358,7 +358,7 @@ popd %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} -find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' +find %{py3dir} -name '*.py' -print0 | xargs -0 sed -i '1s|^#!python|#!%{__python3}|' %endif # with_python3 @@ -633,6 +633,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ %changelog * Tue Apr 22 2014 Thomas Spura - 2.0.0-2 - add BR/R python-path +- fix python -> python3 sed replacement * Thu Apr 3 2014 Thomas Spura - 2.0.0-1 - update to 2.0.0 From abcab17b47fd8d0f2c66acee07d425a95edd4574 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Tue, 22 Apr 2014 10:35:19 +0200 Subject: [PATCH 17/32] fix running testsuite --- ipython.spec | 75 ++++++++++++---------------------------------------- 1 file changed, 17 insertions(+), 58 deletions(-) diff --git a/ipython.spec b/ipython.spec index 732f247..40fbf88 100644 --- a/ipython.spec +++ b/ipython.spec @@ -404,70 +404,28 @@ rm -rf %{buildroot} %check # Ensure that the user's .pythonrc.py is not invoked during any tests. export PYTHONSTARTUP="" -##################################################################### -# Reasons for ignoring tests below: -# * FAIL: Verify that plot is available when pylab_import_all = True -#---------------------------------------------------------------------- -#Traceback (most recent call last): -# File "/builddir/build/BUILDROOT/ipython-0.13.2-1.fc20.noarch/usr/lib/python2.7/site-packages/IPython/testing/decorators.py", line 228, in skipper_func -# return f(*args, **kwargs) -# File "/builddir/build/BUILDROOT/ipython-0.13.2-1.fc20.noarch/usr/lib/python2.7/site-packages/IPython/testing/decorators.py", line 228, in skipper_func -# return f(*args, **kwargs) -# File "/builddir/build/BUILDROOT/ipython-0.13.2-1.fc20.noarch/usr/lib/python2.7/site-packages/IPython/lib/tests/test_irunner_pylab_magic.py", line 92, in test_pylab_import_all_enabled -# self._test_runner(runner,source,output) -# File "/builddir/build/BUILDROOT/ipython-0.13.2-1.fc20.noarch/usr/lib/python2.7/site-packages/IPython/lib/tests/test_irunner_pylab_magic.py", line 53, in _test_runner -# self.fail(message) -# AssertionError: Mismatch in number of lines -# Expected: -# ~~~~~~~~~ -# In \[1\]: from IPython\.config\.application import Application -# In \[2\]: app = Application\.instance\(\) -# In \[3\]: app\.pylab_import_all = True -# In \[4\]: pylab -# ^Welcome to pylab, a matplotlib-based Python environment -# For more information, type 'help\(pylab\)'\. -# In \[5\]: ip=get_ipython\(\) -# In \[6\]: 'plot' in ip\.user_ns -# Out\[6\]: True -# Got: -# ~~~~~~~~~ -# In [1]: from IPython.config.application import Application -# In [2]: app = Application.instance() -# In [3]: app.pylab_import_all = True -# In [4]: pylab -# Xlib: extension "RANDR" missing on display ":99". -# Welcome to pylab, a matplotlib-based Python environment [backend: GTKAgg]. -# For more information, type 'help(pylab)'. -# In [5]: ip=get_ipython() -# In [6]: 'plot' in ip.user_ns -# Out[6]: True -# """Fail immediately, with the given message.""" -#### -> ignoring test_pylab_import_all_disabled|test_pylab_import_all_enabled -##################################################################### -# No *EXCLUDE_TESTS may be empty. Write NONE in such a case. -%global COMMON_EXCLUDE_TESTS testIPython|testPython|test_console_starts -%global PYTHON3EXCLUDE_TESTS NONE -%global PYTHON2EXCLUDE_TESTS test_pylab_import_all_disabled|test_pylab_import_all_enabled - -%global EXCLUDE_TESTS_3 "%{COMMON_EXCLUDE_TESTS}|%{PYTHON3EXCLUDE_TESTS}" -%global EXCLUDE_TESTS_2 "%{COMMON_EXCLUDE_TESTS}|%{PYTHON2EXCLUDE_TESTS}" - %if 0%{?with_python3} pushd %{py3dir} -PYTHONPATH=%{buildroot}%{python3_sitelib} \ - PATH="%{buildroot}%{_bindir}:$PATH" \ - LC_ALL=en_US.UTF-8 \ - xvfb-run \ - %{buildroot}%{_bindir}/iptest3 -v -e %{EXCLUDE_TESTS_3} + mkdir run_tests + pushd run_tests + PYTHONPATH=%{buildroot}%{python3_sitelib} \ + PATH="%{buildroot}%{_bindir}:$PATH" \ + LC_ALL=en_US.UTF-8 \ + xvfb-run \ + %{buildroot}%{_bindir}/iptest3 + popd popd %endif # TODO no ipython in path in koji -PYTHONPATH=%{buildroot}%{python_sitelib} \ - PATH="%{buildroot}%{_bindir}:$PATH" \ - LC_ALL=en_US.UTF-8 \ - xvfb-run \ - %{buildroot}%{_bindir}/iptest -v -e %{EXCLUDE_TESTS_2} +mkdir run_tests +pushd run_tests + PYTHONPATH=%{buildroot}%{python_sitelib} \ + PATH="%{buildroot}%{_bindir}:$PATH" \ + LC_ALL=en_US.UTF-8 \ + xvfb-run \ + %{buildroot}%{_bindir}/iptest2 +popd %endif %files -n python-ipython @@ -634,6 +592,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \ * Tue Apr 22 2014 Thomas Spura - 2.0.0-2 - add BR/R python-path - fix python -> python3 sed replacement +- fix running testsuite * Thu Apr 3 2014 Thomas Spura - 2.0.0-1 - update to 2.0.0 From adb6e405e77e09e777f7d3f58d22a82f56c48d12 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Tue, 22 Apr 2014 10:36:05 +0200 Subject: [PATCH 18/32] fix %%files --- ipython.spec | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/ipython.spec b/ipython.spec index 40fbf88..76fb478 100644 --- a/ipython.spec +++ b/ipython.spec @@ -432,18 +432,16 @@ popd %files -n python-ipython-console %{_bindir}/ipython -%{_bindir}/irunner -%{_bindir}/pycolor +%{_bindir}/ipython2 %{_bindir}/ipcluster +%{_bindir}/ipcluster2 %{_bindir}/ipcontroller +%{_bindir}/ipcontroller2 %{_bindir}/ipengine -%{_bindir}/iplogger +%{_bindir}/ipengine2 %{_mandir}/man*/ipython.* %{_mandir}/man*/ipengine* -%{_mandir}/man*/irunner* -%{_mandir}/man*/pycolor* %{_mandir}/man*/ipc* -%{_mandir}/man*/iplogger* %dir %{python_sitelib}/IPython %{python_sitelib}/IPython/external @@ -451,6 +449,7 @@ popd %dir %{python_sitelib}/IPython/kernel %{python_sitelib}/IPython/kernel/*.py* %{python_sitelib}/IPython/kernel/blocking/ +%{python_sitelib}/IPython/kernel/comm/ %{python_sitelib}/IPython/kernel/inprocess/ %{python_sitelib}/IPython/kernel/ioloop/ %dir %{python_sitelib}/IPython/testing @@ -469,7 +468,6 @@ popd %{python_sitelib}/IPython/nbformat/ %{python_sitelib}/IPython/nbconvert/ %{python_sitelib}/IPython/parallel/ -%{python_sitelib}/IPython/scripts/ %{python_sitelib}/IPython/terminal/ %{python_sitelib}/IPython/utils/ %{python_sitelib}/IPython/kernel/zmq/ @@ -486,6 +484,7 @@ popd %files -n python-ipython-tests %{_bindir}/iptest +%{_bindir}/iptest2 %{python_sitelib}/IPython/*/tests %{python_sitelib}/IPython/*/*/tests @@ -509,19 +508,13 @@ popd %files -n python3-ipython-console %{_bindir}/ipython3 -%{_bindir}/irunner3 -%{_bindir}/pycolor3 %{_bindir}/ipcluster3 %{_bindir}/ipcontroller3 %{_bindir}/ipengine3 -%{_bindir}/iplogger3 # no man pages (yet?) #%{_mandir}/man*/ipython3.* #%{_mandir}/man*/ipengine3* -#%{_mandir}/man*/irunner3* -#%{_mandir}/man*/pycolor3* #%{_mandir}/man*/ipc*3* -#%{_mandir}/man*/iplogger3* %dir %{python3_sitelib}/IPython %{python3_sitelib}/IPython/external @@ -531,6 +524,7 @@ popd %{python3_sitelib}/IPython/kernel/__pycache__/ %{python3_sitelib}/IPython/kernel/*.py* %{python3_sitelib}/IPython/kernel/blocking/ +%{python3_sitelib}/IPython/kernel/comm/ %{python3_sitelib}/IPython/kernel/inprocess/ %{python3_sitelib}/IPython/kernel/ioloop/ %dir %{python3_sitelib}/IPython/testing @@ -551,7 +545,6 @@ popd %{python3_sitelib}/IPython/nbformat/ %{python3_sitelib}/IPython/nbconvert/ %{python3_sitelib}/IPython/parallel/ -%{python3_sitelib}/IPython/scripts/ %{python3_sitelib}/IPython/terminal/ %{python3_sitelib}/IPython/utils/ %{python3_sitelib}/IPython/kernel/zmq/ @@ -593,6 +586,7 @@ popd - add BR/R python-path - fix python -> python3 sed replacement - fix running testsuite +- fix %%files * Thu Apr 3 2014 Thomas Spura - 2.0.0-1 - update to 2.0.0 From 22d1333faf5ec41dbb8dde84858b9e593c661a83 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Tue, 22 Apr 2014 11:33:34 +0200 Subject: [PATCH 19/32] Bump release --- ipython.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipython.spec b/ipython.spec index 76fb478..28d3660 100644 --- a/ipython.spec +++ b/ipython.spec @@ -17,7 +17,7 @@ Name: ipython Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An enhanced interactive Python shell Group: Development/Libraries From d9f735363a2fbe3e5c6e39d16e4340ae5a5cd7c7 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Tue, 29 Apr 2014 16:00:42 +0200 Subject: [PATCH 20/32] Unbundle js-highlight --- ipython.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ipython.spec b/ipython.spec index 28d3660..e3d4c5b 100644 --- a/ipython.spec +++ b/ipython.spec @@ -258,6 +258,7 @@ Requires: python3-matplotlib ################################################# # We need to know nodejs_sitearch and lib BuildRequires: nodejs-packaging +BuildRequires: web-assets-devel BuildRequires: fontawesome-fonts-web Requires: fontawesome-fonts-web @@ -265,8 +266,8 @@ BuildRequires: nodejs-requirejs Requires: nodejs-requirejs BuildRequires: nodejs-underscore Requires: nodejs-underscore -BuildRequires: nodejs-highlight-js -Requires: nodejs-highlight-js +BuildRequires: js-highlight +Requires: js-highlight %description -n python3-ipython-notebook @@ -346,10 +347,18 @@ pushd IPython/html/static/components ls -l popd # TODO backbone bootstrap google-caja jquery jquery-ui marked - for folder in highlight.js requirejs underscore; do + #for folder in highlight.js requirejs underscore; do + for folder in requirejs underscore; do rm -r ${folder} ln -s %{nodejs_sitelib}/${folder} done +# Work around highlight packaging (ipython requires it in build/ subfolder...) +# Unbundle JS stuff WITHIN build subfolder (ipython requires it there...) + for folder in highlight.js; do + rm -r $folder + mkdir -p $folder + ln -s %{_jsdir}/$folder/ $folder/build + done ls -l ls -l * asdf @@ -587,6 +596,7 @@ popd - fix python -> python3 sed replacement - fix running testsuite - fix %%files +- Unbundle js-highlight * Thu Apr 3 2014 Thomas Spura - 2.0.0-1 - update to 2.0.0 From 248f279a0d738da96491bf9690bd381b987a5112 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Tue, 29 Apr 2014 16:03:57 +0200 Subject: [PATCH 21/32] Do global symlinking in a function --- ipython.spec | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/ipython.spec b/ipython.spec index e3d4c5b..1f721db 100644 --- a/ipython.spec +++ b/ipython.spec @@ -335,32 +335,35 @@ rm simplegeneric/_simplegeneric.py popd +%define do_global_symlinking() \ + pushd font-awesome \ + rm -rf font \ + ln -s %{_datadir}/fonts/fontawesome font \ + for folder in css less scss; do \ + rm -rf $folder \ + ln -s %{_datadir}/font-awesome-*/${folder} \ + done \ + ls -l \ + popd \ +# TODO backbone bootstrap google-caja jquery jquery-ui marked \ + #for folder in highlight.js requirejs underscore; do \ + for folder in requirejs underscore; do \ + rm -r ${folder} \ + ln -s %{nodejs_sitelib}/${folder} \ + done \ +# Work around highlight packaging (ipython requires it in build/ subfolder...) \ +# Unbundle JS stuff WITHIN build subfolder (ipython requires it there...) \ + for folder in highlight.js; do \ + rm -r $folder \ + mkdir -p $folder \ + ln -s %{_jsdir}/$folder/ $folder/build \ + done \ +ls -l \ +ls -l * + # unbundle components pushd IPython/html/static/components - pushd font-awesome - rm -rf font - ln -s %{_datadir}/fonts/fontawesome font - for folder in css less scss; do - rm -rf $folder - ln -s %{_datadir}/font-awesome-*/${folder} - done - ls -l - popd -# TODO backbone bootstrap google-caja jquery jquery-ui marked - #for folder in highlight.js requirejs underscore; do - for folder in requirejs underscore; do - rm -r ${folder} - ln -s %{nodejs_sitelib}/${folder} - done -# Work around highlight packaging (ipython requires it in build/ subfolder...) -# Unbundle JS stuff WITHIN build subfolder (ipython requires it there...) - for folder in highlight.js; do - rm -r $folder - mkdir -p $folder - ln -s %{_jsdir}/$folder/ $folder/build - done -ls -l -ls -l * +%do_global_symlinking asdf popd From 45554aa187f5df61d11214ee356cb05712e4afb5 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Tue, 29 Apr 2014 16:08:39 +0200 Subject: [PATCH 22/32] Unbundle components again after installing (setuptools ignore symlinks...) --- ipython.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ipython.spec b/ipython.spec index 1f721db..2319308 100644 --- a/ipython.spec +++ b/ipython.spec @@ -364,7 +364,7 @@ ls -l * # unbundle components pushd IPython/html/static/components %do_global_symlinking -asdf +#asdf popd %if 0%{?with_python3} @@ -407,6 +407,20 @@ popd %{__python} setup.py install -O1 --skip-build --root %{buildroot} +# unbundle components again... +pushd %{buildroot}%{python_sitelib} + pushd IPython/html/static/components + %do_global_symlinking + popd +popd + +%if 0%{?with_python3} +pushd %{buildroot}%{python3_sitelib} + pushd IPython/html/static/components + %do_global_symlinking + popd +popd +%endif # with_python3 %clean rm -rf %{buildroot} From f299ce0801a778f0f8a520b4e29317f8d973b58f Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 23 May 2014 21:31:05 +0200 Subject: [PATCH 23/32] update to 2.1.0 --- ipython.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ipython.spec b/ipython.spec index 2319308..78cdea3 100644 --- a/ipython.spec +++ b/ipython.spec @@ -16,8 +16,8 @@ %endif Name: ipython -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: An enhanced interactive Python shell Group: Development/Libraries @@ -26,7 +26,7 @@ Group: Development/Libraries # There are some extensions released under GPLv2+ License: (BSD and MIT and Python) and GPLv2+ URL: http://ipython.org/ -Source0: http://archive.ipython.org/release/%{version}/%{name}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/source/i/ipython/ipython-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -608,6 +608,9 @@ popd %endif # with_python3 %changelog +* Fri May 23 2014 Thomas Spura - 2.1.0-1 +- update to 2.1.0 + * Tue Apr 22 2014 Thomas Spura - 2.0.0-2 - add BR/R python-path - fix python -> python3 sed replacement From 2c1a7c1cf3c6cd8c754367ecda27c4988a0dcd5d Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 23 May 2014 21:40:40 +0200 Subject: [PATCH 24/32] unbundle js-marked --- ipython.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ipython.spec b/ipython.spec index 78cdea3..4777044 100644 --- a/ipython.spec +++ b/ipython.spec @@ -268,6 +268,8 @@ BuildRequires: nodejs-underscore Requires: nodejs-underscore BuildRequires: js-highlight Requires: js-highlight +BuildRequires: js-marked +Requires: js-marked %description -n python3-ipython-notebook @@ -358,6 +360,12 @@ popd mkdir -p $folder \ ln -s %{_jsdir}/$folder/ $folder/build \ done \ + \ + for folder in marked; do \ + rm -r $folder \ + mkdir -p $folder \ + ln -s %{_jsdir}/$folder/ $folder/lib \ + done \ ls -l \ ls -l * @@ -610,6 +618,7 @@ popd %changelog * Fri May 23 2014 Thomas Spura - 2.1.0-1 - update to 2.1.0 +- Unbundle js-marked * Tue Apr 22 2014 Thomas Spura - 2.0.0-2 - add BR/R python-path From 9d0333fd582406afe0d98854fb8951caa258c2d6 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 23 May 2014 21:52:54 +0200 Subject: [PATCH 25/32] Add provides for bundled exception fpc#416 --- ipython.spec | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ipython.spec b/ipython.spec index 4777044..c7a193c 100644 --- a/ipython.spec +++ b/ipython.spec @@ -271,6 +271,26 @@ Requires: js-highlight BuildRequires: js-marked Requires: js-marked +# Temporal bundling allowed in: +# https://fedorahosted.org/fpc/ticket/416 +############################################################################# +# jquery temporary exception lasts until the release that jquery enters +# the repository. For now, plan on temporary exception for other libraries +# will expire one release after jquery unbundling has entered the repository. +# Lessons from the jquery unbundling may lead us to change that time frame +# as it is our proof of concept of how to unbundle. +############################################################################# +Provides: bundled(js-backbone) +Provides: bundled(bootstrap) +Provides: bundled(js-bootstrap) +Provides: bundled(bootstrap-tour) +Provides: bundled(js-bootstrap-tour) +Provides: bundled(codemirror) +Provides: bundled(js-codemirror) +Provides: bundled(js-jquery) +Provides: bundled(js-jquery-ui) +Provides: bundled(js-google-caja) + %description -n python3-ipython-notebook %{ipython_desc_base} @@ -619,6 +639,7 @@ popd * Fri May 23 2014 Thomas Spura - 2.1.0-1 - update to 2.1.0 - Unbundle js-marked +- Add provides for bundled exception fpc#416 * Tue Apr 22 2014 Thomas Spura - 2.0.0-2 - add BR/R python-path From 3e72ece7e96c5a8440339ff491da0c4a5679f6f7 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 23 May 2014 22:05:42 +0200 Subject: [PATCH 26/32] Add BR python-mock --- ipython.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ipython.spec b/ipython.spec index c7a193c..8200231 100644 --- a/ipython.spec +++ b/ipython.spec @@ -52,6 +52,7 @@ BuildRequires: python-matplotlib #BuildRequires: python-matplotlib-tk BuildRequires: pymongo BuildRequires: PyQt4 +BuildRequires: python-mock # for frontend BuildRequires: python-pygments # for running qt/matplotlib tests From faf26ceba2b24ed8bc547ac1d33aba7dc38da1d1 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 23 May 2014 22:33:28 +0200 Subject: [PATCH 27/32] Cleanup BR/R and R jsonpointer --- ipython.spec | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/ipython.spec b/ipython.spec index 8200231..b70c800 100644 --- a/ipython.spec +++ b/ipython.spec @@ -32,10 +32,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel -BuildRequires: python-simplegeneric -BuildRequires: python-decorator -BuildRequires: python-jsonschema -BuildRequires: python-path %if %{with doc} %endif @@ -43,13 +39,11 @@ BuildRequires: python-path %if %{with check} # for checking/testing BuildRequires: python-nose -BuildRequires: python-simplegeneric # "Tools and libraries available at test time:" BuildRequires: python-zmq BuildRequires: python-zmq-tests BuildRequires: pexpect BuildRequires: python-matplotlib -#BuildRequires: python-matplotlib-tk BuildRequires: pymongo BuildRequires: PyQt4 BuildRequires: python-mock @@ -65,20 +59,12 @@ Requires: python-ipython # add python3 packages %if 0%{?with_python3} BuildRequires: python3-devel -# for checking/testing -BuildRequires: python3-nose -BuildRequires: python3-mglob -#BuildRequires: python3-path -BuildRequires: python3-simplegeneric -BuildRequires: python3-decorator -BuildRequires: python3-jsonschema # "Tools and libraries available at test time:" BuildRequires: python3-zmq BuildRequires: python3-zmq-tests BuildRequires: python3-tornado BuildRequires: python3-pexpect BuildRequires: python3-matplotlib -#BuildRequires: python3-matplotlib-tk BuildRequires: python3-pymongo BuildRequires: python3-PyQt4 # for frontend @@ -127,15 +113,21 @@ This package depends on all python-ipython packages but python-ipython-tests. Summary: An enhanced interactive Python shell for the terminal Requires: python-zmq -#bundled libs +# bundled python packages +BuildRequires: python-decorator +BuildRequires: python-jsonschema +BuildRequires: python-jsonpointer +BuildRequires: python-path +BuildRequires: python-simplegeneric Requires: pexpect +Requires: python-decorator +Requires: python-jsonschema +Requires: python-jsonpointer Requires: python-mglob Requires: python-path Requires: python-simplegeneric -Requires: python-decorator -Requires: python-jsonschema -#For starting ipython from pkg_resources +# for starting ipython from pkg_resources Requires: python-setuptools %description -n python-ipython-console @@ -221,15 +213,24 @@ Summary: An enhanced interactive Python shell for the terminal Requires: python3-zmq -#bundled libs -Requires: python3-pexpect +# bundled python packages +BuildRequires: python3-nose +BuildRequires: python3-decorator +BuildRequires: python3-jsonschema +BuildRequires: python3-jsonpointer +BuildRequires: python3-mglob +#BuildRequires: python3-path +BuildRequires: python3-pexpect +BuildRequires: python3-simplegeneric +Requires: python3-decorator +Requires: python3-jsonpointer +Requires: python3-jsonschema Requires: python3-mglob #Requires: python3-path +Requires: python3-pexpect Requires: python3-simplegeneric -Requires: python3-decorator -Requires: python3-jsonschema -#For starting ipython from pkg_resources +# for starting ipython from pkg_resources Requires: python3-setuptools %description -n python3-ipython-console @@ -345,8 +346,7 @@ rm decorator/_decorator.py rm decorators/_decorators.py rm jsonschema/_jsonschema.py -#WAITFOR python3 support #1061622 -#rm jsonpointer/_jsonpointer.py +rm jsonpointer/_jsonpointer.py rm pexpect/_pexpect.py #WAITFOR python3 support #1016466 From 5e5936451af4682782d2749429b73d15922d3ead Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 23 May 2014 22:38:55 +0200 Subject: [PATCH 28/32] Further cleanup of BR/R --- ipython.spec | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/ipython.spec b/ipython.spec index b70c800..17dffee 100644 --- a/ipython.spec +++ b/ipython.spec @@ -32,6 +32,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel +%if 0%{?with_python3} +BuildRequires: python3-devel +%endif %if %{with doc} %endif @@ -39,16 +42,28 @@ BuildRequires: python-devel %if %{with check} # for checking/testing BuildRequires: python-nose -# "Tools and libraries available at test time:" -BuildRequires: python-zmq -BuildRequires: python-zmq-tests -BuildRequires: pexpect BuildRequires: python-matplotlib +BuildRequires: python-mock BuildRequires: pymongo BuildRequires: PyQt4 -BuildRequires: python-mock +BuildRequires: python-tornado +BuildRequires: python-zmq +BuildRequires: python-zmq-tests # for frontend BuildRequires: python-pygments + +%if 0%{?with_python3} +BuildRequires: python3-nose +BuildRequires: python3-matplotlib +BuildRequires: python3-pymongo +BuildRequires: python3-PyQt4 +BuildRequires: python3-tornado +BuildRequires: python3-zmq +BuildRequires: python3-zmq-tests +# for frontend +BuildRequires: python3-pygments +%endif + # for running qt/matplotlib tests BuildRequires: xorg-x11-server-Xvfb %endif @@ -56,22 +71,6 @@ BuildRequires: xorg-x11-server-Xvfb # Require $current_python_interpreter-ipython Requires: python-ipython -# add python3 packages -%if 0%{?with_python3} -BuildRequires: python3-devel -# "Tools and libraries available at test time:" -BuildRequires: python3-zmq -BuildRequires: python3-zmq-tests -BuildRequires: python3-tornado -BuildRequires: python3-pexpect -BuildRequires: python3-matplotlib -BuildRequires: python3-pymongo -BuildRequires: python3-PyQt4 -# for frontend -BuildRequires: python3-pygments - -Requires: python3-zmq -%endif %global ipython_desc_base \ IPython provides a replacement for the interactive Python interpreter with\ @@ -214,7 +213,6 @@ Requires: python3-zmq # bundled python packages -BuildRequires: python3-nose BuildRequires: python3-decorator BuildRequires: python3-jsonschema BuildRequires: python3-jsonpointer From 6c5748bbc9ae1a24f3af2189c5ef9f9c30261ee4 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 23 May 2014 22:40:09 +0200 Subject: [PATCH 29/32] Delete obsolete R on mglob --- ipython.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/ipython.spec b/ipython.spec index 17dffee..4870a1d 100644 --- a/ipython.spec +++ b/ipython.spec @@ -122,7 +122,6 @@ Requires: pexpect Requires: python-decorator Requires: python-jsonschema Requires: python-jsonpointer -Requires: python-mglob Requires: python-path Requires: python-simplegeneric @@ -216,14 +215,12 @@ Requires: python3-zmq BuildRequires: python3-decorator BuildRequires: python3-jsonschema BuildRequires: python3-jsonpointer -BuildRequires: python3-mglob #BuildRequires: python3-path BuildRequires: python3-pexpect BuildRequires: python3-simplegeneric Requires: python3-decorator Requires: python3-jsonpointer Requires: python3-jsonschema -Requires: python3-mglob #Requires: python3-path Requires: python3-pexpect Requires: python3-simplegeneric From 04c4250220cb30992f4e40505e20e3e8776ed7cd Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 23 May 2014 22:41:41 +0200 Subject: [PATCH 30/32] python3-path is now also existing --- ipython.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ipython.spec b/ipython.spec index 4870a1d..07b4312 100644 --- a/ipython.spec +++ b/ipython.spec @@ -215,13 +215,13 @@ Requires: python3-zmq BuildRequires: python3-decorator BuildRequires: python3-jsonschema BuildRequires: python3-jsonpointer -#BuildRequires: python3-path +BuildRequires: python3-path BuildRequires: python3-pexpect BuildRequires: python3-simplegeneric Requires: python3-decorator Requires: python3-jsonpointer Requires: python3-jsonschema -#Requires: python3-path +Requires: python3-path Requires: python3-pexpect Requires: python3-simplegeneric @@ -344,8 +344,7 @@ rm jsonschema/_jsonschema.py rm jsonpointer/_jsonpointer.py rm pexpect/_pexpect.py -#WAITFOR python3 support #1016466 -#rm path/_path.py +rm path/_path.py rm simplegeneric/_simplegeneric.py From 6cb5c42485ff5ae1046a9970369dc77f4b370d5f Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 23 May 2014 22:42:13 +0200 Subject: [PATCH 31/32] Delete marked from todo list to unbundle --- ipython.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipython.spec b/ipython.spec index 07b4312..9d28785 100644 --- a/ipython.spec +++ b/ipython.spec @@ -362,7 +362,7 @@ popd done \ ls -l \ popd \ -# TODO backbone bootstrap google-caja jquery jquery-ui marked \ +# TODO backbone bootstrap google-caja jquery jquery-ui \ #for folder in highlight.js requirejs underscore; do \ for folder in requirejs underscore; do \ rm -r ${folder} \ From 3f2ece06de9b9a7b364eb0290936d6a1313c9381 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 30 May 2014 00:09:34 +0200 Subject: [PATCH 32/32] Add BR Cython --- ipython.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ipython.spec b/ipython.spec index 9d28785..496b97e 100644 --- a/ipython.spec +++ b/ipython.spec @@ -41,6 +41,7 @@ BuildRequires: python3-devel %if %{with check} # for checking/testing +BuildRequires: Cython BuildRequires: python-nose BuildRequires: python-matplotlib BuildRequires: python-mock @@ -53,6 +54,7 @@ BuildRequires: python-zmq-tests BuildRequires: python-pygments %if 0%{?with_python3} +BuildRequires: python3-cython BuildRequires: python3-nose BuildRequires: python3-matplotlib BuildRequires: python3-pymongo @@ -62,11 +64,11 @@ BuildRequires: python3-zmq BuildRequires: python3-zmq-tests # for frontend BuildRequires: python3-pygments -%endif +%endif # with_python3 # for running qt/matplotlib tests BuildRequires: xorg-x11-server-Xvfb -%endif +%endif # with check # Require $current_python_interpreter-ipython Requires: python-ipython @@ -635,6 +637,7 @@ popd - update to 2.1.0 - Unbundle js-marked - Add provides for bundled exception fpc#416 +- Add BR Cython * Tue Apr 22 2014 Thomas Spura - 2.0.0-2 - add BR/R python-path