[Python-modules-commits] [ipywidgets] 12/14: 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 ipywidgets.

commit ef7a76028181a94d27246507b939fcb8cc4eff72
Merge: cc704ec 1dd3089
Author: Gordon Ball <gordon at chronitis.net>
Date:   Tue Nov 29 17:25:40 2016 +0100

    merge patched into master

 debian/.git-dpm                                      |  4 ++--
 ...ld-extension.js-in-widgetsnbextension-setup.patch | 20 ++++++++++++++++----
 widgetsnbextension/setup.py                          |  5 -----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index a900341,0000000..2ebf62f
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
- dbe42b24d2f7175035293ee7ae54af80186b9715
- dbe42b24d2f7175035293ee7ae54af80186b9715
++1dd3089e1312623cc6e76126ac00ac911c330f1c
++1dd3089e1312623cc6e76126ac00ac911c330f1c
 +787a902919a1edd762701e3238c9c3cf03271786
 +787a902919a1edd762701e3238c9c3cf03271786
 +ipywidgets_5.2.2.orig.tar.gz
 +a4e18ed6a91bca345ee074af8d77b2bebc4a1e96
 +2483849
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Don-t-build-extension.js-in-widgetsnbextension-setup.patch
index c9ec03a,0000000..54c4674
mode 100644,000000..100644
--- a/debian/patches/0003-Don-t-build-extension.js-in-widgetsnbextension-setup.patch
+++ b/debian/patches/0003-Don-t-build-extension.js-in-widgetsnbextension-setup.patch
@@@ -1,26 -1,0 +1,38 @@@
- From dbe42b24d2f7175035293ee7ae54af80186b9715 Mon Sep 17 00:00:00 2001
++From 1dd3089e1312623cc6e76126ac00ac911c330f1c Mon Sep 17 00:00:00 2001
 +From: Gordon Ball <gordon at chronitis.net>
 +Date: Tue, 29 Nov 2016 17:23:22 +0100
 +Subject: Don't build extension.js in widgetsnbextension/setup.py, since it
 + will be done manually
 +
 +---
-  widgetsnbextension/setup.py | 5 -----
-  1 file changed, 5 deletions(-)
++ widgetsnbextension/setup.py | 10 ----------
++ 1 file changed, 10 deletions(-)
 +
 +diff --git a/widgetsnbextension/setup.py b/widgetsnbextension/setup.py
- index cc4515b..4c8fc06 100644
++index cc4515b..e01ca47 100644
 +--- a/widgetsnbextension/setup.py
 ++++ b/widgetsnbextension/setup.py
 +@@ -197,11 +197,6 @@ setup_args = dict(
 +         'Programming Language :: Python :: 3',
 +         'Programming Language :: Python :: 3.3',
 +     ],
 +-    cmdclass        = {
 +-        'build_py': js_prerelease(build_py),
 +-        'sdist': js_prerelease(sdist, strict=True),
 +-        'jsdeps': NPM,
 +-    },
 +     data_files      = [(
 +             'share/jupyter/nbextensions/jupyter-js-widgets', [
 +                 'widgetsnbextension/static/extension.js',
++@@ -214,11 +209,6 @@ setup_args = dict(
++ 
++ import setuptools
++ 
++-if 'setuptools' in sys.modules:
++-    # setup.py develop should check for submodules
++-    from setuptools.command.develop import develop
++-    setup_args['cmdclass']['develop'] = js_prerelease(develop, strict=True)
++-
++ setuptools_args = {}
++ install_requires = setuptools_args['install_requires'] = [
++     'notebook>=4.2.0',

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