[Python-modules-commits] [ipywidgets] 05/09: 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 222a03dd36c2828fbbc67b39a44afb1cbf5ee683
Merge: c08dfbe 4deef8b
Author: Gordon Ball <gordon at chronitis.net>
Date:   Sun Nov 6 12:53:46 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ally-import-setuptools-to-pick-up-depende.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  3 +--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index db08bbe,0000000..4fee3f0
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 67681957821f1c4dc3363cd100a6174c923abaf0
- 67681957821f1c4dc3363cd100a6174c923abaf0
++4deef8b19390e93354152dc550fc3134d4525a26
++4deef8b19390e93354152dc550fc3134d4525a26
 +67681957821f1c4dc3363cd100a6174c923abaf0
 +67681957821f1c4dc3363cd100a6174c923abaf0
 +ipywidgets_5.2.2.orig.tar.gz
 +f4f57d78fe6e89ef87e9eee31dd9e3f15d1e8601
 +2420984
diff --cc debian/patches/0001-Unconditionally-import-setuptools-to-pick-up-depende.patch
index 0000000,0000000..2cdea15
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Unconditionally-import-setuptools-to-pick-up-depende.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 4deef8b19390e93354152dc550fc3134d4525a26 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(-)
++
++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 --cc debian/patches/series
index 0000000,0000000..c74976d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Unconditionally-import-setuptools-to-pick-up-depende.patch

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