[Python-modules-commits] [ipykernel] 11/15: merge patched into master

[Julien Cristau]

This is an automated email from the git hooks/post-receive script.

jcristau pushed a commit to branch master
in repository ipykernel.

commit 7145c0a0b3d43c67220562e8e1b40f84bb6119f4
Merge: d0f52bc 61f660c
Author: David Douard <david.douard at logilab.fr>
Date:   Fri Apr 8 16:52:46 2016 +0200

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...e_print-may-produce-stderr-content-when-ex.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 ipykernel/tests/test_kernel.py                      |  1 -
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 053d1e2,0000000..ecd7854
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 9f029f4ee9dc7c07c787c49b0bf8a05e9048ec84
- 9f029f4ee9dc7c07c787c49b0bf8a05e9048ec84
++61f660c0388db8e901dc3cd3b2d51fbc34b77ef8
++61f660c0388db8e901dc3cd3b2d51fbc34b77ef8
 +dad8c3435089bb8700d9cb387546811501adf414
 +dad8c3435089bb8700d9cb387546811501adf414
 +ipykernel_4.3.1.orig.tar.gz
 +1a16f3366a655edd1c0dc264fc3fe1489cf2c2df
 +83268
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-test_simple_print-may-produce-stderr-content-when-ex.patch
index 0000000,0000000..008bfc0
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-test_simple_print-may-produce-stderr-content-when-ex.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 61f660c0388db8e901dc3cd3b2d51fbc34b77ef8 Mon Sep 17 00:00:00 2001
++From: David Douard <david.douard at logilab.fr>
++Date: Fri, 8 Apr 2016 16:52:26 +0200
++Subject: test_simple_print may produce stderr content when executed in sbuild
++
++---
++ ipykernel/tests/test_kernel.py | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/ipykernel/tests/test_kernel.py b/ipykernel/tests/test_kernel.py
++index 0057333..e01d8fc 100644
++--- a/ipykernel/tests/test_kernel.py
+++++ b/ipykernel/tests/test_kernel.py
++@@ -37,7 +37,6 @@ def test_simple_print():
++         msg_id, content = execute(kc=kc, code="print ('hi')")
++         stdout, stderr = assemble_output(iopub)
++         nt.assert_equal(stdout, 'hi\n')
++-        nt.assert_equal(stderr, '')
++         _check_master(kc, expected=True)
++ 
++ 
diff --cc debian/patches/series
index 7a8ba43,0000000..1433743
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-use-setuptools-for-everything-so-python-Depends-subs.patch
++0002-test_simple_print-may-produce-stderr-content-when-ex.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/ipykernel.git