[Python-modules-commits] [ipykernel] 06/08: merge patched into master
Gordon Ball
chronitis-guest at moszumanska.debian.org
Sun Dec 4 13:55:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
chronitis-guest pushed a commit to branch master
in repository ipykernel.
commit de842926c3c037288d03269a5c83778dbefa797b
Merge: 35cea5d bcbd66f
Author: Gordon Ball <gordon at chronitis.net>
Date: Sun Dec 4 13:32:32 2016 +0100
merge patched into master
PKG-INFO | 2 +-
debian/.git-dpm | 6 +++---
...setuptools-for-everything-so-python-Depends-subs.patch | 2 +-
..._simple_print-may-produce-stderr-content-when-ex.patch | 2 +-
...3-Made-build-reproducible-patch-by-Daniel-Shahaf.patch | 2 +-
docs/changelog.rst | 8 ++++++++
ipykernel/_version.py | 2 +-
ipykernel/comm/comm.py | 15 ++++++++++-----
8 files changed, 26 insertions(+), 13 deletions(-)
diff --cc debian/.git-dpm
index b82b7a9,0000000..7970268
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
- de2834e5710f7888687bd3b144aa1ea829dc2496
- de2834e5710f7888687bd3b144aa1ea829dc2496
- e8de387ae770137ca132a448d9569d3962178ae9
++bcbd66f322e1a89961cd576013a286169cd2766d
++bcbd66f322e1a89961cd576013a286169cd2766d
++2fde3650039ca6041bb8e34faaeb0ee0682ec5da
+2fde3650039ca6041bb8e34faaeb0ee0682ec5da
+ipykernel_4.5.2.orig.tar.gz
+b94d49af3a9a89eb9b4d32c63868b8fcb689de19
+88282
+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 9090460,0000000..bad7b1d
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 ee087632a00f26eba6aa8c96d1d78a94e53dcfa4 Mon Sep 17 00:00:00 2001
++From ba74c2a59279dd41a394410adcc3aad357dc9e9a 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 db7ce2b,0000000..b8d44e7
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 0d69b3d252151f90002f15867db949ca6b3b484b Mon Sep 17 00:00:00 2001
++From 001255ac80d677c91f5940639166f445705c38f6 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 1bec74e,0000000..21db1d3
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 de2834e5710f7888687bd3b144aa1ea829dc2496 Mon Sep 17 00:00:00 2001
++From bcbd66f322e1a89961cd576013a286169cd2766d 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
More information about the Python-modules-commits
mailing list