[Python-modules-commits] [nbformat] 04/07: 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 nbformat.

commit 45c7dfc6882cb79c1d77e4a897e5dc568b9faaa1
Merge: 83fed55 50cc84c
Author: Gordon Ball <gordon at chronitis.net>
Date:   Mon Aug 28 23:13:48 2017 +0200

    merge patched into master

 .travis.yml                                        |  1 +
 debian/.git-dpm                                    |  6 ++--
 ...ols-for-all-targets-so-python-Depends-sub.patch |  2 +-
 docs/changelog.rst                                 | 20 ++++++++++++
 docs/conf.py                                       |  2 +-
 docs/format_description.rst                        | 17 ++++++++--
 nbformat/_version.py                               |  3 +-
 nbformat/notebooknode.py                           | 37 +++++++++++++++++++---
 nbformat/sign.py                                   | 24 +++++++-------
 nbformat/tests/test4jupyter_metadata.ipynb         | 30 ++++++++++++++++++
 nbformat/tests/test_validator.py                   |  7 ++++
 nbformat/v4/nbbase.py                              | 14 ++++----
 nbformat/v4/nbformat.v4.schema.json                | 33 ++++++++++++++++++-
 nbformat/v4/nbjson.py                              |  2 +-
 nbformat/validator.py                              | 34 +++++++++++++++-----
 package.json                                       |  2 +-
 16 files changed, 192 insertions(+), 42 deletions(-)

diff --cc debian/.git-dpm
index f1bed94,0000000..6b9761d
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
- 91dbbb5908efd8edcbff2282f26c2a6b9192a7a4
- 91dbbb5908efd8edcbff2282f26c2a6b9192a7a4
- 6d800a2ea951ef516cd569146cf18ec4aef8dfbf
++50cc84ceb4220c74dcc467e61a7e64f086e624ed
++50cc84ceb4220c74dcc467e61a7e64f086e624ed
++c08c300140cb82053678bdf4aebe622cc55bf768
 +c08c300140cb82053678bdf4aebe622cc55bf768
 +nbformat_4.4.0.orig.tar.gz
 +f740364f87f810de50c0550064853224971f1335
 +119351
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-setuptools-for-all-targets-so-python-Depends-sub.patch
index 4a8de45,0000000..62a923d
mode 100644,000000..100644
--- a/debian/patches/0001-Use-setuptools-for-all-targets-so-python-Depends-sub.patch
+++ b/debian/patches/0001-Use-setuptools-for-all-targets-so-python-Depends-sub.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 91dbbb5908efd8edcbff2282f26c2a6b9192a7a4 Mon Sep 17 00:00:00 2001
++From 50cc84ceb4220c74dcc467e61a7e64f086e624ed Mon Sep 17 00:00:00 2001
 +From: Julien Puydt <julien.puydt at laposte.net>
 +Date: Tue, 6 Oct 2015 07:51:30 +0200
 +Subject: Use setuptools for all targets so 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 f85f30a..161b16d 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -83,8 +83,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/nbformat.git