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

commit d7e5e11d15563135780694aa03a214ff81ca3e65
Merge: a754489 847b596
Author: Gordon Ball <gordon at chronitis.net>
Date:   Fri Jun 23 13:33:50 2017 +0200

    merge patched into master

 .travis.yml                                        | 12 ++--
 debian/.git-dpm                                    |  6 +-
 ...ols-for-everything-so-the-python-Depends-.patch |  4 +-
 docs/changelog.rst                                 | 20 +++++++
 docs/environment.yml                               |  1 -
 docs/messaging.rst                                 | 59 ++++++++++++++++++--
 jupyter_client/_version.py                         |  4 +-
 jupyter_client/blocking/client.py                  |  5 ++
 jupyter_client/channels.py                         |  7 ++-
 jupyter_client/connect.py                          |  6 +-
 jupyter_client/consoleapp.py                       |  2 +-
 jupyter_client/manager.py                          |  2 +-
 jupyter_client/session.py                          | 18 ++++++
 jupyter_client/tests/test_adapter.py               |  9 ++-
 jupyter_client/tests/test_client.py                |  6 +-
 jupyter_client/tests/test_connect.py               | 65 +++++++++++++++++-----
 jupyter_client/tests/test_jsonutil.py              | 32 +++++------
 jupyter_client/tests/test_kernelmanager.py         | 10 ++--
 jupyter_client/tests/test_kernelspec.py            |  7 ++-
 jupyter_client/tests/test_multikernelmanager.py    |  7 +--
 jupyter_client/tests/test_public_api.py            | 10 ++--
 jupyter_client/tests/test_session.py               | 18 +++++-
 jupyter_client/tests/utils.py                      | 11 +++-
 jupyter_client/threaded.py                         |  9 ++-
 setup.py                                           |  2 +-
 25 files changed, 239 insertions(+), 93 deletions(-)

diff --cc debian/.git-dpm
index 5bbfedc,0000000..e6a2009
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
- fa198f59fe5c40100620e55a698cbbc1eab5b5b9
- fa198f59fe5c40100620e55a698cbbc1eab5b5b9
- 79aca5b5d11f7159c2afb8e602204fa5352f85fb
++847b596ce73681422067c35e24dad2d4384d3cb0
++847b596ce73681422067c35e24dad2d4384d3cb0
++79f89b801f8fe1112867307413a9c82103d30ae9
 +79f89b801f8fe1112867307413a9c82103d30ae9
 +jupyter-client_5.1.0.orig.tar.gz
 +c9de3fb01110e913a7d9483e88bb9ba7a5f8a0ae
 +268889
 +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 fa9a98a,0000000..79b19c8
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 fa198f59fe5c40100620e55a698cbbc1eab5b5b9 Mon Sep 17 00:00:00 2001
++From 847b596ce73681422067c35e24dad2d4384d3cb0 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 ca7cb96..6c18ebd 100644
++index 51bcf2f..797a9f7 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