[Python-modules-commits] [jupyter-client] 03/10: 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 c936b2c8bc2a7e24018a46ea6e5d8d4ba376d0cd
Merge: 3ba4bb3 f138815
Author: Gordon Ball <gordon at chronitis.net>
Date:   Mon Dec 18 16:15:53 2017 +0000

    merge patched into master

 .gitignore                                         |  2 +
 CONTRIBUTING.md                                    |  2 +
 README.md                                          | 34 +++++++++
 debian/.git-dpm                                    |  6 +-
 ...ols-for-everything-so-the-python-Depends-.patch | 25 -------
 debian/patches/series                              |  1 -
 docs/api/kernelspec.rst                            | 11 +++
 docs/changelog.rst                                 | 42 +++++++++++
 docs/conf.py                                       |  5 +-
 docs/environment.yml                               |  2 +
 docs/kernels.rst                                   | 12 +++-
 docs/messaging.rst                                 | 29 ++++++--
 jupyter_client/_version.py                         |  4 +-
 jupyter_client/connect.py                          | 57 +++++++++++++--
 jupyter_client/ioloop/manager.py                   | 37 +++++-----
 jupyter_client/ioloop/restarter.py                 | 27 +++-----
 jupyter_client/kernelapp.py                        | 81 ++++++++++++++++++++++
 jupyter_client/kernelspec.py                       | 68 ++++++++++++++----
 jupyter_client/manager.py                          | 56 ++++++++++-----
 jupyter_client/restarter.py                        | 15 +++-
 jupyter_client/session.py                          | 17 +++--
 jupyter_client/tests/test_connect.py               | 27 ++++++++
 jupyter_client/tests/test_kernelapp.py             | 67 ++++++++++++++++++
 jupyter_client/tests/test_kernelspec.py            |  1 +
 jupyter_client/tests/test_session.py               | 21 +++++-
 jupyter_client/threaded.py                         |  2 +-
 scripts/jupyter-kernel                             |  5 ++
 scripts/jupyter-kernelspec                         |  8 ---
 setup.py                                           | 59 +++++++++-------
 29 files changed, 565 insertions(+), 158 deletions(-)

diff --cc debian/.git-dpm
index 95bf5d8,0000000..9173414
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
- 847b596ce73681422067c35e24dad2d4384d3cb0
- 847b596ce73681422067c35e24dad2d4384d3cb0
- 79f89b801f8fe1112867307413a9c82103d30ae9
++f13881542dc2997f49c02b2834a1de2fb06b79aa
++f13881542dc2997f49c02b2834a1de2fb06b79aa
++f13881542dc2997f49c02b2834a1de2fb06b79aa
 +f13881542dc2997f49c02b2834a1de2fb06b79aa
 +jupyter-client_5.2.0.orig.tar.gz
 +2bd8522cf63381d06060ae1a0285a6e2a07d3a64
 +273246
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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