diff --git a/ipython-0.13.2-print-syntax.patch b/ipython-0.13.2-print-syntax.patch new file mode 100644 index 0000000..eb5b232 --- /dev/null +++ b/ipython-0.13.2-print-syntax.patch @@ -0,0 +1,33 @@ +commit e72159b29f656ccdf0e0643612f80a40ab3ffde4 +Author: Fernando Perez +Date: Fri Jun 28 13:45:12 2013 -0500 + + Change doctest that was failing due to python2/3 print syntax issues. + +diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py +index 5d9edcb..28d368f 100644 +--- a/IPython/testing/decorators.py ++++ b/IPython/testing/decorators.py +@@ -128,15 +128,17 @@ def make_label_dec(label,ds=None): + -------- + + A simple labeling decorator: +- >>> slow = make_label_dec('slow') +- >>> print slow.__doc__ +- Labels a test as 'slow'. + ++ >>> slow = make_label_dec('slow') ++ >>> slow.__doc__ ++ "Labels a test as 'slow'." ++ + And one that uses multiple labels and a custom docstring: ++ + >>> rare = make_label_dec(['slow','hard'], + ... "Mix labels 'slow' and 'hard' for rare tests.") +- >>> print rare.__doc__ +- Mix labels 'slow' and 'hard' for rare tests. ++ >>> rare.__doc__ ++ "Mix labels 'slow' and 'hard' for rare tests." + + Now, let's test using this one: + >>> @rare diff --git a/ipython.spec b/ipython.spec index dab6a36..5b096bd 100644 --- a/ipython.spec +++ b/ipython.spec @@ -29,6 +29,8 @@ Source0: http://archive.ipython.org/release/%{version}/%{name}-%{version} # 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) @@ -257,6 +259,7 @@ This package contains the gui of %{name}, which requires PyQt. %setup -q %patch0 -p 1 +%patch1 -p 1 # delete bundling libs pushd IPython/external @@ -360,7 +363,7 @@ export PYTHONSTARTUP="" #### -> 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 make_label_dec|testIPython|testPython|test_console_starts +%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