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

commit b90eeb86f8377eda8a9a55e548fd073328a1a07e
Merge: 8ffc401 a3de825
Author: Gordon Ball <gordon at chronitis.net>
Date:   Fri Feb 3 21:31:04 2017 +0100

    merge patched into master

 PKG-INFO                                           |  2 +-
 README.md                                          | 24 ++++++--
 debian/.git-dpm                                    |  6 +-
 ...ally-use-setuptools-so-that-dependencies-.patch |  2 +-
 docs/changelog.rst                                 | 16 ++++++
 docs/conf.py                                       | 22 +++++++-
 docs/environment.yml                               | 11 ++++
 docs/index.rst                                     |  4 ++
 docs/release.rst                                   |  8 +--
 docs/requirements.txt                              |  7 ++-
 jupyter_console/_version.py                        |  2 +-
 jupyter_console/app.py                             | 12 ++--
 jupyter_console/completer.py                       | 39 +------------
 jupyter_console/ptshell.py                         | 64 ++++++++++++++++------
 14 files changed, 139 insertions(+), 80 deletions(-)

diff --cc debian/.git-dpm
index 56aff86,0000000..ab7d496
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
- 23dd3f9b13ce1ea8d6fbf2dd924b786768e0bc40
- 23dd3f9b13ce1ea8d6fbf2dd924b786768e0bc40
- 08236a52dc46cccef83726b75e0033b5938be29f
++a3de825860b604054c15064aec23955b18e2d2bb
++a3de825860b604054c15064aec23955b18e2d2bb
++9b8893fc4b251ab7e27ce63876de31680b6ea03a
 +9b8893fc4b251ab7e27ce63876de31680b6ea03a
 +jupyter-console_5.1.0.orig.tar.gz
 +08568e713fe150667416432ed712d407a361b24e
 +26661
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Unconditionally-use-setuptools-so-that-dependencies-.patch
index 2418007,0000000..05d7a08
mode 100644,000000..100644
--- a/debian/patches/0001-Unconditionally-use-setuptools-so-that-dependencies-.patch
+++ b/debian/patches/0001-Unconditionally-use-setuptools-so-that-dependencies-.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 23dd3f9b13ce1ea8d6fbf2dd924b786768e0bc40 Mon Sep 17 00:00:00 2001
++From a3de825860b604054c15064aec23955b18e2d2bb Mon Sep 17 00:00:00 2001
 +From: Gordon Ball <gordon at chronitis.net>
 +Date: Tue, 1 Nov 2016 15:42:31 +0100
 +Subject: Unconditionally use setuptools so that dependencies are detected
 +
 +---
 + setup.py | 3 +--
 + 1 file changed, 1 insertion(+), 2 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
 +index 1f9a604..27ce8a9 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -71,8 +71,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-console.git