[Python-modules-commits] [ipykernel] 06/07: merge patched into master

[Gordon Ball]

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

chronitis-guest pushed a commit to branch master
in repository ipykernel.

commit 6e12e80518104f78cc6dd68008fbc9ff664b9c96
Merge: a8f5245 de2834e
Author: Gordon Ball <gordon at chronitis.net>
Date:   Sat Nov 19 14:12:10 2016 +0100

    merge patched into master

 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |   6 +-
 ...ols-for-everything-so-python-Depends-subs.patch |   2 +-
 ..._print-may-produce-stderr-content-when-ex.patch |   2 +-
 ...build-reproducible-patch-by-Daniel-Shahaf.patch |   2 +-
 docs/changelog.rst                                 |  10 ++
 docs/conf.py                                       |   4 +-
 docs/index.rst                                     |   2 +-
 ipykernel/_version.py                              |   2 +-
 ipykernel/comm/comm.py                             |   4 +-
 ipykernel/inprocess/socket.py                      |   7 +-
 ipykernel/inprocess/tests/test_kernel.py           |   8 ++
 ipykernel/iostream.py                              | 136 ++++++++++++++-------
 ipykernel/ipkernel.py                              |   2 -
 ipykernel/kernelbase.py                            |   6 +-
 ipykernel/tests/test_jsonutil.py                   |  12 +-
 ipykernel/zmqshell.py                              |   2 +-
 17 files changed, 147 insertions(+), 62 deletions(-)

diff --cc debian/.git-dpm
index 4dcd71a,0000000..45ff531
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
- b0c0ece25c98d9422f9959be7e2c4ecbcf6957df
- b0c0ece25c98d9422f9959be7e2c4ecbcf6957df
- b8b5d6f2eed1af837cb3fe112e39aada777aed31
++de2834e5710f7888687bd3b144aa1ea829dc2496
++de2834e5710f7888687bd3b144aa1ea829dc2496
++e8de387ae770137ca132a448d9569d3962178ae9
 +e8de387ae770137ca132a448d9569d3962178ae9
 +ipykernel_4.5.1.orig.tar.gz
 +8128ed19672276651ee8a89d26fd86e33808b3cd
 +88457
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-use-setuptools-for-everything-so-python-Depends-subs.patch
index d82638a,0000000..9090460
mode 100644,000000..100644
--- a/debian/patches/0001-use-setuptools-for-everything-so-python-Depends-subs.patch
+++ b/debian/patches/0001-use-setuptools-for-everything-so-python-Depends-subs.patch
@@@ -1,24 -1,0 +1,24 @@@
- From aefe3634c8f46a4d468b019ddf90a4813687495d Mon Sep 17 00:00:00 2001
++From ee087632a00f26eba6aa8c96d1d78a94e53dcfa4 Mon Sep 17 00:00:00 2001
 +From: Julien Puydt <julien.puydt at laposte.net>
 +Date: Tue, 6 Oct 2015 07:58:09 +0200
 +Subject: use setuptools for everything so python*:Depends substitutions work
 +
 +Forwarded: no
 +---
 + setup.py | 3 +--
 + 1 file changed, 1 insertion(+), 2 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
 +index 034439f..40127c1 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -74,8 +74,7 @@ setup_args = dict(
 +     ],
 + )
 + 
 +-if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv):
 +-    import setuptools
 ++import setuptools
 + 
 + setuptools_args = {}
 + install_requires = setuptools_args['install_requires'] = [
diff --cc debian/patches/0002-test_simple_print-may-produce-stderr-content-when-ex.patch
index 30d61ea,0000000..db7ce2b
mode 100644,000000..100644
--- a/debian/patches/0002-test_simple_print-may-produce-stderr-content-when-ex.patch
+++ b/debian/patches/0002-test_simple_print-may-produce-stderr-content-when-ex.patch
@@@ -1,21 -1,0 +1,21 @@@
- From d66e32e8b4799dae5bad93544fc0c400bb91eb9c Mon Sep 17 00:00:00 2001
++From 0d69b3d252151f90002f15867db949ca6b3b484b 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 f0c0d01..5f4a053 100644
 +--- a/ipykernel/tests/test_kernel.py
 ++++ b/ipykernel/tests/test_kernel.py
 +@@ -44,7 +44,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/0003-Made-build-reproducible-patch-by-Daniel-Shahaf.patch
index 62d4dc0,0000000..1bec74e
mode 100644,000000..100644
--- a/debian/patches/0003-Made-build-reproducible-patch-by-Daniel-Shahaf.patch
+++ b/debian/patches/0003-Made-build-reproducible-patch-by-Daniel-Shahaf.patch
@@@ -1,22 -1,0 +1,22 @@@
- From b0c0ece25c98d9422f9959be7e2c4ecbcf6957df Mon Sep 17 00:00:00 2001
++From de2834e5710f7888687bd3b144aa1ea829dc2496 Mon Sep 17 00:00:00 2001
 +From: Julien Puydt <julien.puydt at laposte.net>
 +Date: Sun, 2 Oct 2016 14:32:58 +0200
 +Subject: Made build reproducible -- patch by Daniel Shahaf
 +
 +---
 + ipykernel/kernelspec.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/ipykernel/kernelspec.py b/ipykernel/kernelspec.py
 +index dcd57d4..3106791 100644
 +--- a/ipykernel/kernelspec.py
 ++++ b/ipykernel/kernelspec.py
 +@@ -78,7 +78,7 @@ def write_kernel_spec(path=None, overrides=None, extra_arguments=None):
 +     if overrides:
 +         kernel_dict.update(overrides)
 +     with open(pjoin(path, 'kernel.json'), 'w') as f:
 +-        json.dump(kernel_dict, f, indent=1)
 ++        json.dump(kernel_dict, f, indent=1, sort_keys=True)
 +     
 +     return path
 + 

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