[Python-modules-commits] [ipywidgets] 03/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 60ac83e36a502dffd6a884295c1db4637eb122cb
Merge: 3e2aa50 5d92123
Author: Gordon Ball <gordon at chronitis.net>
Date:   Tue Nov 29 15:05:20 2016 +0100

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...nally-import-setuptools-to-pick-up-depende.patch | 21 ++++++++++++++++++---
 ...am-package.json-otherwise-the-webpack-buil.patch |  2 +-
 widgetsnbextension/setup.py                         |  3 +--
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 2829d2c,0000000..e3a3dfe
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
- 51c4c20a3f2a73aebc76d75c363721cc737b4205
- 51c4c20a3f2a73aebc76d75c363721cc737b4205
++5d9212393ebbc1656afb9549b105489672ee0a23
++5d9212393ebbc1656afb9549b105489672ee0a23
 +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/0001-Unconditionally-import-setuptools-to-pick-up-depende.patch
index 28648d8,0000000..eb42838
mode 100644,000000..100644
--- a/debian/patches/0001-Unconditionally-import-setuptools-to-pick-up-depende.patch
+++ b/debian/patches/0001-Unconditionally-import-setuptools-to-pick-up-depende.patch
@@@ -1,23 -1,0 +1,38 @@@
- From cfb0c29c2c690636e276466411d32bbca7c0955f Mon Sep 17 00:00:00 2001
++From b01ecb3d9d3fc6d982eef5c2fd74136d84f920b5 Mon Sep 17 00:00:00 2001
 +From: Gordon Ball <gordon at chronitis.net>
 +Date: Sun, 6 Nov 2016 12:53:39 +0100
 +Subject: Unconditionally import setuptools to pick up dependencies
 +
 +---
-  setup.py | 3 +--
-  1 file changed, 1 insertion(+), 2 deletions(-)
++ setup.py                    | 3 +--
++ widgetsnbextension/setup.py | 3 +--
++ 2 files changed, 2 insertions(+), 4 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
 +index 9379b90..a1036f4 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -98,8 +98,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'] = [
++diff --git a/widgetsnbextension/setup.py b/widgetsnbextension/setup.py
++index 5f39180..cc4515b 100644
++--- a/widgetsnbextension/setup.py
+++++ b/widgetsnbextension/setup.py
++@@ -212,8 +212,7 @@ setup_args = dict(
++     include_package_data = True,
++ )
++ 
++-if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv):
++-    import setuptools
+++import setuptools
++ 
++ if 'setuptools' in sys.modules:
++     # setup.py develop should check for submodules
diff --cc debian/patches/0002-Fix-upstream-package.json-otherwise-the-webpack-buil.patch
index d1430eb,0000000..f371f5c
mode 100644,000000..100644
--- a/debian/patches/0002-Fix-upstream-package.json-otherwise-the-webpack-buil.patch
+++ b/debian/patches/0002-Fix-upstream-package.json-otherwise-the-webpack-buil.patch
@@@ -1,27 -1,0 +1,27 @@@
- From 51c4c20a3f2a73aebc76d75c363721cc737b4205 Mon Sep 17 00:00:00 2001
++From 5d9212393ebbc1656afb9549b105489672ee0a23 Mon Sep 17 00:00:00 2001
 +From: Ximin Luo <infinity0 at debian.org>
 +Date: Thu, 24 Nov 2016 20:24:11 +0100
 +Subject: Fix upstream package.json, otherwise the webpack build emits errors
 +
 +Note that we're not actually using this; this is just for documentation purposes
 +---
 + docs/package.json | 4 +++-
 + 1 file changed, 3 insertions(+), 1 deletion(-)
 +
 +diff --git a/docs/package.json b/docs/package.json
 +index d83d6b1..f67e7cb 100644
 +--- a/docs/package.json
 ++++ b/docs/package.json
 +@@ -31,9 +31,11 @@
 +     "babel-preset-es2015": "^6.3.13",
 +     "bower": "^1.7.0",
 +     "css-loader": "^0.23.1",
 ++    "es6-promise": "^3.1.2",
 +     "file-loader": "^0.8.5",
 ++    "font-awesome": "^4.5.0",
 +     "json-loader": "^0.5.4",
 +-    "jupyter-js-widgets": "file:../jupyter-js-widgets",
 ++    "jupyter-js-widgets": "1.2.0",
 +     "rimraf": "^2.5.2",
 +     "style-loader": "^0.13.0",
 +     "url-loader": "^0.5.7",

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