[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 03a2f88decd7c3a1b88316dfc40a944beac0fb49
Merge: 40657b7 64c00b0
Author: Gordon Ball <gordon at chronitis.net>
Date:   Fri Jun 23 13:12:23 2017 +0200

    merge patched into master

 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                                 |  9 ++++++
 ipykernel/_version.py                              |  2 +-
 ipykernel/eventloops.py                            | 32 +++++++++++++++++++---
 ipykernel/ipkernel.py                              |  4 +--
 ipykernel/kernelbase.py                            | 11 +++++++-
 9 files changed, 56 insertions(+), 14 deletions(-)

diff --cc debian/.git-dpm
index 481eb4d,0000000..00ef6b7
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
- fcfec3b2b8806be9b98eb3aa21a3949f6d77e5b1
- fcfec3b2b8806be9b98eb3aa21a3949f6d77e5b1
- 45d8eb0f2832816a938eec25c5f9668c43b1d7bb
++64c00b08ef3d5477345cf7f18aa98c21d72e58a7
++64c00b08ef3d5477345cf7f18aa98c21d72e58a7
++d0a88e1037cdabdca6c588c913d58510a5f8c999
 +d0a88e1037cdabdca6c588c913d58510a5f8c999
 +ipykernel_4.6.1.orig.tar.gz
 +ae496a120e10b0942f1f7690ad630e0dedda794d
 +94179
 +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 407e5da,0000000..4dcd2d7
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 0f617f802a1da5ce6cd095ab7eafdc3c773ca78c Mon Sep 17 00:00:00 2001
++From 5463b5a9972321007bd558fa61b3b51a47ef1552 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 998a374..14b6a9e 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -76,8 +76,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 8195020,0000000..f5a6fee
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 d2e41c3d8bbcf50cec6c19fb0c9f155414ab9990 Mon Sep 17 00:00:00 2001
++From 8b42d2933b84f81ee654de5415900d25703f8c07 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 0c4a2b8..8bfa9dc 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 dbe9ad3,0000000..5d4c358
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 fcfec3b2b8806be9b98eb3aa21a3949f6d77e5b1 Mon Sep 17 00:00:00 2001
++From 64c00b08ef3d5477345cf7f18aa98c21d72e58a7 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 bce8051..1b69d0c 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