[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 80aaddb5a346f2ec2a966a257e86d7e76df529ea
Merge: ba4b6f3 1f14738
Author: Gordon Ball <gordon at chronitis.net>
Date:   Sun Dec 4 12:55:55 2016 +0100

    merge patched into master

 .gitignore                                         |   8 +-
 .travis.yml                                        |   7 +-
 debian/.git-dpm                                    |   6 +-
 ...ols-for-all-targets-so-python-Depends-sub.patch |   4 +-
 docs/changelog.rst                                 |  18 ++
 docs/format_description.rst                        |  23 +-
 nbformat/_version.py                               |   2 +-
 nbformat/sign.py                                   |  74 +++--
 nbformat/tests/test4custom.ipynb                   |  52 ++++
 nbformat/tests/test4docinfo.ipynb                  | 311 +++++++++++++++++++++
 nbformat/tests/test_sign.py                        |  22 +-
 nbformat/tests/test_validator.py                   |  18 +-
 nbformat/v4/convert.py                             |   8 +-
 nbformat/v4/nbbase.py                              |   2 +-
 nbformat/v4/nbformat.v4.schema.json                |  38 ++-
 nbformat/v4/rwbase.py                              |  41 ++-
 nbformat/v4/tests/nbexamples.py                    |  33 ++-
 nbformat/v4/tests/test_convert.py                  |   6 +-
 nbformat/v4/tests/test_json.py                     |  31 ++
 nbformat/v4/tests/test_nbbase.py                   |  60 ++--
 nbformat/v4/tests/test_validate.py                 |  26 +-
 setup.py                                           |   6 +-
 22 files changed, 677 insertions(+), 119 deletions(-)

diff --cc debian/.git-dpm
index e7fef0e,0000000..022e687
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
- 77b82c8b289466987dbe666363633ec604d3bb22
- 77b82c8b289466987dbe666363633ec604d3bb22
- 6be481e4d8dcb614d15f3583c1c1df13e7116514
++1f14738fb23cb2f62ef42e3a73d2a706897886ad
++1f14738fb23cb2f62ef42e3a73d2a706897886ad
++abea36f71cf6aa39a0cf653f6476c033c72ec7f8
 +abea36f71cf6aa39a0cf653f6476c033c72ec7f8
 +nbformat_4.2.0.orig.tar.gz
 +fcb5030e3802eeda703333bb4885ae5ed460f88d
 +114714
 +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 78d9d3c,0000000..709240f
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 77b82c8b289466987dbe666363633ec604d3bb22 Mon Sep 17 00:00:00 2001
++From 1f14738fb23cb2f62ef42e3a73d2a706897886ad 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 467aa5b..67aa816 100644
++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