[Python-modules-commits] [jupyter-client] 04/09: 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 jupyter-client.

commit c9b6e6d2fe4d9bdb11bd2c204fc804ad6116a29b
Merge: d273909 6a6aa83
Author: Julien Cristau <julien.cristau at logilab.fr>
Date:   Fri Apr 8 12:11:53 2016 +0200

    merge patched into master

 PKG-INFO                                           |  2 +-
 debian/.git-dpm                                    |  6 +-
 ...ols-for-everything-so-the-python-Depends-.patch |  2 +-
 docs/api/kernelspec.rst                            |  2 +
 docs/changelog.rst                                 | 32 ++++++++
 docs/messaging.rst                                 | 77 +++++++-------------
 docs/wrapperkernels.rst                            |  5 +-
 jupyter_client/_version.py                         |  2 +-
 jupyter_client/blocking/client.py                  | 48 ++++++++++--
 jupyter_client/channels.py                         |  4 +-
 jupyter_client/client.py                           |  9 ++-
 jupyter_client/connect.py                          | 39 ++++++++--
 jupyter_client/consoleapp.py                       | 19 +++--
 jupyter_client/kernelspec.py                       | 85 +++++++++++++++++++---
 jupyter_client/kernelspecapp.py                    | 70 ++++++++++++++++--
 jupyter_client/launcher.py                         | 36 ++++++---
 jupyter_client/localinterfaces.py                  |  7 +-
 jupyter_client/manager.py                          | 14 ++--
 jupyter_client/multikernelmanager.py               |  7 +-
 jupyter_client/session.py                          | 18 ++++-
 jupyter_client/tests/signalkernel.py               | 70 ++++++++++++++++++
 jupyter_client/tests/test_connect.py               | 24 +++++-
 jupyter_client/tests/test_kernelmanager.py         | 80 +++++++++++++++++++-
 jupyter_client/tests/test_kernelspec.py            | 44 +++++++----
 jupyter_client/tests/utils.py                      | 56 ++++++++++++++
 25 files changed, 619 insertions(+), 139 deletions(-)

diff --cc debian/.git-dpm
index 042c2b8,0000000..9c82557
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
- cf69fdf17e6aad265be5b2f97fa58532ac5bb0bf
- cf69fdf17e6aad265be5b2f97fa58532ac5bb0bf
- 76ddf089d302a84c4a742e53057d42c6872ffa4d
++6a6aa83af07dfab50af2086b2a537eb7b85dd7a5
++6a6aa83af07dfab50af2086b2a537eb7b85dd7a5
++40e1acb3ecf4c8be857491a1ad1d36acabb50c43
 +40e1acb3ecf4c8be857491a1ad1d36acabb50c43
 +jupyter-client_4.2.2.orig.tar.gz
 +7a1c20000f7e088e65f35e7fc994d1240b4b148d
 +254282
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-use-setuptools-for-everything-so-the-python-Depends-.patch
index 6f8d6bf,0000000..2296f34
mode 100644,000000..100644
--- a/debian/patches/0001-use-setuptools-for-everything-so-the-python-Depends-.patch
+++ b/debian/patches/0001-use-setuptools-for-everything-so-the-python-Depends-.patch
@@@ -1,25 -1,0 +1,25 @@@
- From cf69fdf17e6aad265be5b2f97fa58532ac5bb0bf Mon Sep 17 00:00:00 2001
++From 6a6aa83af07dfab50af2086b2a537eb7b85dd7a5 Mon Sep 17 00:00:00 2001
 +From: Julien Puydt <julien.puydt at laposte.net>
 +Date: Tue, 6 Oct 2015 07:54:22 +0200
 +Subject: use setuptools for everything so the python*:Depends substitution
 + work
 +
 +Forwarded: no
 +---
 + setup.py | 3 +--
 + 1 file changed, 1 insertion(+), 2 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
 +index 3532421..da60603 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -70,8 +70,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/jupyter-client.git