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

[Julien Cristau]

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

jcristau pushed a commit to branch master
in repository ipykernel.

commit 4812a855dc2ecbf0e9970e2f5a9fb274041a9381
Merge: 81d7967 9f029f4
Author: David Douard <david.douard at logilab.fr>
Date:   Fri Apr 8 14:08:00 2016 +0200

    merge patched into master

 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |   6 +-
 ...ols-for-everything-so-python-Depends-subs.patch |   4 +-
 docs/changelog.rst                                 |  24 ++
 ipykernel/_version.py                              |   2 +-
 ipykernel/codeutil.py                              |   3 +
 ipykernel/connect.py                               |  65 ++--
 ipykernel/datapub.py                               |   5 +
 ipykernel/inprocess/ipkernel.py                    |  21 +-
 ipykernel/iostream.py                              | 352 +++++++++++++--------
 ipykernel/ipkernel.py                              |  45 ++-
 ipykernel/kernelapp.py                             |  51 ++-
 ipykernel/kernelbase.py                            | 124 ++++----
 ipykernel/kernelspec.py                            |   2 +-
 ipykernel/log.py                                   |   3 +
 ipykernel/pickleutil.py                            |   3 +
 ipykernel/serialize.py                             |   3 +
 ipykernel/tests/test_connect.py                    |   8 +-
 ipykernel/tests/test_kernel.py                     |  61 +++-
 ipykernel/zmqshell.py                              |  30 +-
 setup.py                                           |   1 +
 21 files changed, 545 insertions(+), 270 deletions(-)

diff --cc debian/.git-dpm
index ebe3428,0000000..053d1e2
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
- c33d82b7ee43556a0e67a44ae1c5c94d9eb5a421
- c33d82b7ee43556a0e67a44ae1c5c94d9eb5a421
- 3322506537ef59acca04053fe9088b26c4f633cf
++9f029f4ee9dc7c07c787c49b0bf8a05e9048ec84
++9f029f4ee9dc7c07c787c49b0bf8a05e9048ec84
++dad8c3435089bb8700d9cb387546811501adf414
 +dad8c3435089bb8700d9cb387546811501adf414
 +ipykernel_4.3.1.orig.tar.gz
 +1a16f3366a655edd1c0dc264fc3fe1489cf2c2df
 +83268
 +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 0299bc2,0000000..f084087
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 c33d82b7ee43556a0e67a44ae1c5c94d9eb5a421 Mon Sep 17 00:00:00 2001
++From 9f029f4ee9dc7c07c787c49b0bf8a05e9048ec84 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 3162744..924fd48 100644
++index f05f72c..ca8703a 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -75,8 +75,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'] = [

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