[Python-modules-commits] [ipykernel] 06/09: merge patched into master
Gordon Ball
chronitis-guest at moszumanska.debian.org
Wed Dec 13 08:50:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
chronitis-guest pushed a commit to branch master
in repository ipykernel.
commit 3a0e28403ef889bcbba38766635b67d2a36bb5e9
Merge: 4f44a7d 5944474
Author: Gordon Ball <gordon at chronitis.net>
Date: Wed Dec 13 08:33:18 2017 +0000
merge patched into master
.travis.yml | 5 +-
appveyor.yml | 6 +-
debian/.git-dpm | 6 +-
...ols-for-everything-so-python-Depends-subs.patch | 4 +-
..._print-may-produce-stderr-content-when-ex.patch | 8 +--
...build-reproducible-patch-by-Daniel-Shahaf.patch | 2 +-
docs/changelog.rst | 18 +++++
docs/conf.py | 2 +-
ipykernel/_version.py | 2 +-
ipykernel/connect.py | 9 ++-
ipykernel/displayhook.py | 4 +-
ipykernel/eventloops.py | 29 ++++++++
ipykernel/inprocess/tests/test_kernel.py | 6 +-
ipykernel/inprocess/tests/test_kernelmanager.py | 28 ++++----
ipykernel/iostream.py | 70 ++++++++++++------
ipykernel/ipkernel.py | 83 +++++++++++++++++-----
ipykernel/jsonutil.py | 46 +++++++++---
ipykernel/kernelapp.py | 3 +-
ipykernel/kernelbase.py | 11 ++-
ipykernel/pylab/backend_inline.py | 6 +-
ipykernel/tests/_asyncio.py | 17 +++++
ipykernel/tests/test_connect.py | 18 +++--
ipykernel/tests/test_embed_kernel.py | 27 +++----
ipykernel/tests/test_eventloop.py | 44 ++++++++++++
ipykernel/tests/test_jsonutil.py | 43 ++++++-----
ipykernel/tests/test_kernel.py | 61 ++++++++--------
ipykernel/tests/test_kernelspec.py | 18 ++---
ipykernel/tests/test_message_spec.py | 52 +++++++-------
ipykernel/tests/test_pickleutil.py | 13 ++--
ipykernel/tests/test_serialize.py | 83 ++++++++++------------
ipykernel/tests/test_start_kernel.py | 12 ++--
ipykernel/tests/test_zmq_shell.py | 43 ++++++-----
ipykernel/tests/utils.py | 21 +++---
ipykernel/zmqshell.py | 4 +-
setup.cfg | 9 +--
setup.py | 8 ++-
36 files changed, 510 insertions(+), 311 deletions(-)
diff --cc debian/.git-dpm
index 8d351cf,0000000..df47855
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
- 64c00b08ef3d5477345cf7f18aa98c21d72e58a7
- 64c00b08ef3d5477345cf7f18aa98c21d72e58a7
- d0a88e1037cdabdca6c588c913d58510a5f8c999
++5944474422227c023ecc7f2d0ee374ecfecf9f27
++5944474422227c023ecc7f2d0ee374ecfecf9f27
++017d6a026d10428f285efa959cfdd02d07c6d4ac
+017d6a026d10428f285efa959cfdd02d07c6d4ac
+ipykernel_4.7.0.orig.tar.gz
+71a5f6eb35276ab52a868c59f8e863a845284d17
+96170
+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 4dcd2d7,0000000..3d43ab9
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 5463b5a9972321007bd558fa61b3b51a47ef1552 Mon Sep 17 00:00:00 2001
++From ac43215b44347925fa802b02614e29335ac3e22b 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
++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 f5a6fee,0000000..d146116
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 8b42d2933b84f81ee654de5415900d25703f8c07 Mon Sep 17 00:00:00 2001
++From 5db4e18805da445c33549a8eec3c6d1865a942c2 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
++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)
- nt.assert_equal(stdout, 'hi\n')
- - nt.assert_equal(stderr, '')
++ 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 5d4c358,0000000..d5049ed
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 64c00b08ef3d5477345cf7f18aa98c21d72e58a7 Mon Sep 17 00:00:00 2001
++From 5944474422227c023ecc7f2d0ee374ecfecf9f27 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
More information about the Python-modules-commits
mailing list