[Python-modules-commits] r27545 - in packages/ipython/trunk/debian (11 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Wed Feb 5 19:34:24 UTC 2014
Date: Wednesday, February 5, 2014 @ 19:34:23
Author: jtaylor-guest
Revision: 27545
update patches
drop applied patches: python3.4-fixes.patch, test-fix.patch
add test-default-tk.patch to run tests with debians matplotlib default
refresh patches
Added:
packages/ipython/trunk/debian/patches/test-default-tk.patch
Modified:
packages/ipython/trunk/debian/changelog
packages/ipython/trunk/debian/patches/debianize-error-messages.patch
packages/ipython/trunk/debian/patches/no-submodule-check.patch
packages/ipython/trunk/debian/patches/series
packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
packages/ipython/trunk/debian/rules
packages/ipython/trunk/debian/tests/control
packages/ipython/trunk/debian/tests/python3
Deleted:
packages/ipython/trunk/debian/patches/python3.4-fixes.patch
packages/ipython/trunk/debian/patches/test-fix.patch
Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog 2014-02-05 19:34:19 UTC (rev 27544)
+++ packages/ipython/trunk/debian/changelog 2014-02-05 19:34:23 UTC (rev 27545)
@@ -2,6 +2,8 @@
* New upstream release candidate
Closes: #737067, #736560
+ * drop applied patches: python3.4-fixes.patch, test-fix.patch
+ * add test-default-tk.patch to run tests with Debian's matplotlib default
-- Julian Taylor <jtaylor.debian at googlemail.com> Wed, 05 Feb 2014 19:07:18 +0100
Modified: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch 2014-02-05 19:34:19 UTC (rev 27544)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch 2014-02-05 19:34:23 UTC (rev 27545)
@@ -5,7 +5,7 @@
--- a/IPython/config/application.py
+++ b/IPython/config/application.py
-@@ -534,9 +534,19 @@ class Application(SingletonConfigurable)
+@@ -540,9 +540,19 @@ class Application(SingletonConfigurable)
If a global instance already exists, this reinitializes and starts it
"""
Modified: packages/ipython/trunk/debian/patches/no-submodule-check.patch
===================================================================
--- packages/ipython/trunk/debian/patches/no-submodule-check.patch 2014-02-05 19:34:19 UTC (rev 27544)
+++ packages/ipython/trunk/debian/patches/no-submodule-check.patch 2014-02-05 19:34:23 UTC (rev 27545)
@@ -2,7 +2,7 @@
make no sense for a package
--- a/IPython/html/notebookapp.py
+++ b/IPython/html/notebookapp.py
-@@ -652,15 +652,7 @@ class NotebookApp(BaseIPythonApplication
+@@ -654,15 +654,7 @@ class NotebookApp(BaseIPythonApplication
print self.notebook_info()
def init_components(self):
Deleted: packages/ipython/trunk/debian/patches/python3.4-fixes.patch
===================================================================
--- packages/ipython/trunk/debian/patches/python3.4-fixes.patch 2014-02-05 19:34:19 UTC (rev 27544)
+++ packages/ipython/trunk/debian/patches/python3.4-fixes.patch 2014-02-05 19:34:23 UTC (rev 27545)
@@ -1,29 +0,0 @@
-Description: Backport PR #4758 - fixes for Python 3.4.
- Not complete, plenty more failures
-Author: Thomas Kluyver <takowl at gmail.com>
-Origin: 341c046c7ce22c633daf3cb12f3f439c6f376056
-
---- a/IPython/utils/tests/test_text.py
-+++ b/IPython/utils/tests/test_text.py
-@@ -15,6 +15,7 @@
- import os
- import math
- import random
-+import sys
-
- import nose.tools as nt
-
-@@ -107,7 +108,12 @@ def eval_formatter_no_slicing_check(f):
- s = f.format('{stuff[slice(1,4)]}', **ns)
- nt.assert_equal(s, 'ell')
-
-- nt.assert_raises(SyntaxError, f.format, "{a[:]}")
-+ if sys.version_info >= (3, 4):
-+ # String formatting has changed in Python 3.4, so this now works.
-+ s = f.format("{a[:]}", a=[1, 2])
-+ nt.assert_equal(s, "[1, 2]")
-+ else:
-+ nt.assert_raises(SyntaxError, f.format, "{a[:]}")
-
- def test_eval_formatter():
- f = text.EvalFormatter()
Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series 2014-02-05 19:34:19 UTC (rev 27544)
+++ packages/ipython/trunk/debian/patches/series 2014-02-05 19:34:23 UTC (rev 27545)
@@ -7,5 +7,4 @@
parallel-2to3.patch
shared-static-path.patch
no-submodule-check.patch
-test-fix.patch
-python3.4-fixes.patch
+test-default-tk.patch
Added: packages/ipython/trunk/debian/patches/test-default-tk.patch
===================================================================
--- packages/ipython/trunk/debian/patches/test-default-tk.patch (rev 0)
+++ packages/ipython/trunk/debian/patches/test-default-tk.patch 2014-02-05 19:34:23 UTC (rev 27545)
@@ -0,0 +1,38 @@
+Description: default debian backend is tk
+Forwarded: not-needed
+--- a/IPython/core/tests/test_pylabtools.py
++++ b/IPython/core/tests/test_pylabtools.py
+@@ -95,24 +95,24 @@ class TestPylabSwitch(object):
+ def test_qt(self):
+ s = self.Shell()
+ gui, backend = s.enable_matplotlib(None)
+- nt.assert_equal(gui, 'qt')
+- nt.assert_equal(s.pylab_gui_select, 'qt')
++ nt.assert_equal(gui, 'tk')
++ nt.assert_equal(s.pylab_gui_select, 'tk')
+
+ gui, backend = s.enable_matplotlib('inline')
+ nt.assert_equal(gui, 'inline')
+- nt.assert_equal(s.pylab_gui_select, 'qt')
++ nt.assert_equal(s.pylab_gui_select, 'tk')
+
+- gui, backend = s.enable_matplotlib('qt')
+- nt.assert_equal(gui, 'qt')
+- nt.assert_equal(s.pylab_gui_select, 'qt')
++ gui, backend = s.enable_matplotlib('tk')
++ nt.assert_equal(gui, 'tk')
++ nt.assert_equal(s.pylab_gui_select, 'tk')
+
+ gui, backend = s.enable_matplotlib('inline')
+ nt.assert_equal(gui, 'inline')
+- nt.assert_equal(s.pylab_gui_select, 'qt')
++ nt.assert_equal(s.pylab_gui_select, 'tk')
+
+ gui, backend = s.enable_matplotlib()
+- nt.assert_equal(gui, 'qt')
+- nt.assert_equal(s.pylab_gui_select, 'qt')
++ nt.assert_equal(gui, 'tk')
++ nt.assert_equal(s.pylab_gui_select, 'tk')
+
+ def test_inline(self):
+ s = self.Shell()
Deleted: packages/ipython/trunk/debian/patches/test-fix.patch
===================================================================
--- packages/ipython/trunk/debian/patches/test-fix.patch 2014-02-05 19:34:19 UTC (rev 27544)
+++ packages/ipython/trunk/debian/patches/test-fix.patch 2014-02-05 19:34:23 UTC (rev 27545)
@@ -1,14 +0,0 @@
-Description: handle split of static files in tests
---- a/IPython/core/tests/test_display.py
-+++ b/IPython/core/tests/test_display.py
-@@ -48,7 +48,9 @@ def test_image_filename_defaults():
- nt.assert_raises(ValueError, display.Image)
- nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True)
- from IPython.html import DEFAULT_STATIC_FILES_PATH
-- imgfile = os.path.join(DEFAULT_STATIC_FILES_PATH, 'base/images/ipynblogo.png')
-+ imgfile = os.path.join(tpath, 'html/static/base/images/ipynblogo.png')
-+ if not os.path.exists(imgfile):
-+ imgfile = os.path.join(DEFAULT_STATIC_FILES_PATH, 'base/images/ipynblogo.png')
- img = display.Image(filename=imgfile)
- nt.assert_equal('png', img.format)
- nt.assert_is_not_none(img._repr_png_())
Modified: packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch
===================================================================
--- packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch 2014-02-05 19:34:19 UTC (rev 27544)
+++ packages/ipython/trunk/debian/patches/use-LightBG-colorscheme.patch 2014-02-05 19:34:23 UTC (rev 27545)
@@ -13,7 +13,7 @@
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
-@@ -125,7 +125,7 @@ def get_default_colors():
+@@ -126,7 +126,7 @@ def get_default_colors():
elif os.name=='nt':
return 'Linux'
else:
Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules 2014-02-05 19:34:19 UTC (rev 27544)
+++ packages/ipython/trunk/debian/rules 2014-02-05 19:34:23 UTC (rev 27545)
@@ -32,12 +32,15 @@
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- # IPython.frontend requires X
+ # test_not_writable_ipdir, fails as root
+ # test_console_starts, leaks python process
+ # test_constructor, test_notebook_help, as-installed only (static-path change)
set -e && for pyvers in $(PYVERS); do \
LC_ALL=C.UTF-8 HOME=$(CURDIR)/build \
PATH=$(CURDIR)/IPython/scripts/:$(PATH) PYTHONPATH=$(CURDIR) \
xvfb-run -a -s "-screen 0 1280x1024x24 -noreset" \
- python$$pyvers $(CURDIR)/IPython/scripts/iptest -v -e test_not_writable_ipdir -e test_console_starts; \
+ python$$pyvers $(CURDIR)/IPython/scripts/iptest -v -e test_not_writable_ipdir -e test_console_starts \
+ -e test_constructor -e test_notebook_help;\
done
endif
Modified: packages/ipython/trunk/debian/tests/control
===================================================================
--- packages/ipython/trunk/debian/tests/control 2014-02-05 19:34:19 UTC (rev 27544)
+++ packages/ipython/trunk/debian/tests/control 2014-02-05 19:34:23 UTC (rev 27545)
@@ -23,6 +23,8 @@
python3-matplotlib,
python3-pyqt4,
python3-tk,
+ texlive-latex-base,
+ dvipng,
xauth,
xvfb
Modified: packages/ipython/trunk/debian/tests/python3
===================================================================
--- packages/ipython/trunk/debian/tests/python3 2014-02-05 19:34:19 UTC (rev 27544)
+++ packages/ipython/trunk/debian/tests/python3 2014-02-05 19:34:23 UTC (rev 27545)
@@ -29,8 +29,6 @@
done
for py in $pys; do
- # fails but functional, mostly issues in the tests themselves
- [ "$py" = "python3.4" ] && continue
LC_ALL=C.UTF-8 HOME=$PWD \
PATH=$PWD/IPython/scripts/:$PATH PYTHONPATH=$PWD \
xvfb-run -a -s "-screen 0 1280x1024x24 -noreset" \
More information about the Python-modules-commits
mailing list