[Python-modules-commits] [ipykernel] 06/08: 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 74571023028ce6e22c0c2347fa958fd975887a22
Merge: 46ad4e5 a9cef4b
Author: Gordon Ball <gordon at chronitis.net>
Date:   Tue Feb 6 11:02:31 2018 +0000

    merge patched into master

 MANIFEST.in                                        |   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                                 |  17 +++
 docs/conf.py                                       |   3 +
 docs/requirements.txt                              |   1 +
 ipykernel/_eventloop_macos.py                      | 153 +++++++++++++++++++++
 ipykernel/_version.py                              |   2 +-
 ipykernel/eventloops.py                            | 117 +++++++++-------
 ipykernel/kernelbase.py                            |   6 +-
 ipykernel/zmqshell.py                              |   4 +
 readthedocs.yml                                    |   1 +
 14 files changed, 262 insertions(+), 56 deletions(-)

diff --cc debian/.git-dpm
index f93425e,0000000..cbbee0c
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
- 5944474422227c023ecc7f2d0ee374ecfecf9f27
- 5944474422227c023ecc7f2d0ee374ecfecf9f27
- 017d6a026d10428f285efa959cfdd02d07c6d4ac
++a9cef4b6369f3ea1cc99695032e841c00f489e10
++a9cef4b6369f3ea1cc99695032e841c00f489e10
++669a5bd37c9d020646d02a2d3eb0a88c74758f2d
 +669a5bd37c9d020646d02a2d3eb0a88c74758f2d
 +ipykernel_4.8.0.orig.tar.gz
 +d5ceb0861025f95150cfa843e21012b8c9babc4b
 +97632
 +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 3d43ab9,0000000..f28220b
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 ac43215b44347925fa802b02614e29335ac3e22b Mon Sep 17 00:00:00 2001
++From f4db5b7f3aa57c19c925324e78404a193aecb4d2 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 4b38885..1935cfb 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 d146116,0000000..24de451
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 5db4e18805da445c33549a8eec3c6d1865a942c2 Mon Sep 17 00:00:00 2001
++From fc5b42fc810f8c66568520b992dd8766f7c4ee4b 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 fa39491..06886e4 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)
 +         assert stdout == 'hi\n'
 +-        assert stderr == ''
 +         _check_master(kc, expected=True)
 + 
 + 
diff --cc debian/patches/0003-Made-build-reproducible-patch-by-Daniel-Shahaf.patch
index d5049ed,0000000..6c0e3df
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 5944474422227c023ecc7f2d0ee374ecfecf9f27 Mon Sep 17 00:00:00 2001
++From a9cef4b6369f3ea1cc99695032e841c00f489e10 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