[Python-modules-commits] [ipywidgets] 10/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 cc704ec54c491deec107e4ce7f4d824d94491a8c
Merge: 2169167 dbe42b2
Author: Gordon Ball <gordon at chronitis.net>
Date:   Tue Nov 29 17:23:27 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-extension.js-in-widgetsnbextension-setup.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 widgetsnbextension/setup.py                        |  5 -----
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index e3a3dfe,0000000..a900341
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
- 5d9212393ebbc1656afb9549b105489672ee0a23
- 5d9212393ebbc1656afb9549b105489672ee0a23
++dbe42b24d2f7175035293ee7ae54af80186b9715
++dbe42b24d2f7175035293ee7ae54af80186b9715
 +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 0000000,0000000..c9ec03a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Don-t-build-extension.js-in-widgetsnbextension-setup.patch
@@@ -1,0 -1,0 +1,26 @@@
++From dbe42b24d2f7175035293ee7ae54af80186b9715 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(-)
++
++diff --git a/widgetsnbextension/setup.py b/widgetsnbextension/setup.py
++index cc4515b..4c8fc06 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',
diff --cc debian/patches/series
index df76e62,0000000..d0f6172
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Unconditionally-import-setuptools-to-pick-up-depende.patch
 +0002-Fix-upstream-package.json-otherwise-the-webpack-buil.patch
++0003-Don-t-build-extension.js-in-widgetsnbextension-setup.patch

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