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

commit 05cf4636a93ed3fc57cfa0d34d25b70c3da3dc92
Merge: 5bf13b9 002e8e7
Author: Julien Cristau <julien.cristau at logilab.fr>
Date:   Fri Apr 8 11:02:27 2016 +0200

    merge patched into master

 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |   6 +-
 debian/changelog                                   |   7 +-
 ...ols-for-everything-so-the-python-Depends-.patch |   6 +-
 docs/changelog.rst                                 |  15 +++
 jupyter.py                                         |   4 +
 jupyter_core/command.py                            |  23 ++++-
 jupyter_core/migrate.py                            |   2 +
 jupyter_core/tests/test_command.py                 |  19 +++-
 jupyter_core/tests/test_migrate.py                 |   5 +-
 jupyter_core/troubleshoot.py                       | 104 +++++++++++++++++++++
 jupyter_core/version.py                            |   2 +-
 setup.py                                           |   2 +
 13 files changed, 180 insertions(+), 17 deletions(-)

diff --cc debian/.git-dpm
index 923f167,0000000..a7b4909
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
- e561369ca0a279adfad92fc7f24239e57f5cb8ca
- e561369ca0a279adfad92fc7f24239e57f5cb8ca
- 128588e7789361a857f36d8242141d4332c19378
++002e8e775639e872fab6ef3ea3f28b49c2f9b6f6
++002e8e775639e872fab6ef3ea3f28b49c2f9b6f6
++d48348ce954c43313119bf18eb71f8b4e66d5ee5
 +d48348ce954c43313119bf18eb71f8b4e66d5ee5
 +jupyter-core_4.1.0.orig.tar.gz
 +7836ef4bbe750048361624c6a3968ed733bf8f6a
 +56500
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 585643c,0000000..52ffc65
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,0 +1,12 @@@
- jupyter-core (4.0.6-1) UNRELEASED; urgency=medium
++jupyter-core (4.1.0-1) UNRELEASED; urgency=medium
 +
 +  [ Julien Puydt ]
 +  * Initial release. (Closes: #799470)
 +
 +  [ Ondřej Nový ]
 +  * Fixed VCS URL (https)
 +
-  -- Julien Puydt <julien.puydt at laposte.net>  Sat, 19 Sep 2015 15:40:07 +0200
++  [ Julien Cristau ]
++  * Update from 4.0.6 to 4.1.0
++
++ -- Julien Cristau <julien.cristau at logilab.fr>  Fri, 08 Apr 2016 11:05:14 +0200
diff --cc debian/patches/0001-Use-setuptools-for-everything-so-the-python-Depends-.patch
index df6555e,0000000..999ddf2
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 e561369ca0a279adfad92fc7f24239e57f5cb8ca Mon Sep 17 00:00:00 2001
++From 002e8e775639e872fab6ef3ea3f28b49c2f9b6f6 Mon Sep 17 00:00:00 2001
 +From: Julien Puydt <julien.puydt at laposte.net>
 +Date: Tue, 6 Oct 2015 07:21:43 +0200
 +Subject: Use setuptools for everything (so the 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 f155663..68649f9 100644
++index f041234..a0c89f3 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -73,8 +73,7 @@ setup_args = dict(
++@@ -74,8 +74,7 @@ setup_args = dict(
 +     ],
 + )
 + 
 +-if any(arg.startswith('bdist') for arg in sys.argv):
 +-    import setuptools
 ++import setuptools
 + 
 + setuptools_args = {}
 + 

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