[Python-modules-commits] [jupyter-console] 01/02: Convert from git-dpm to patches unapplied format

[Gordon Ball]

This is an automated email from the git hooks/post-receive script.

chronitis-guest pushed a commit to branch patch-queue/master
in repository jupyter-console.

commit dfa31bde8d0d89a8d1c662af5878e4736440b0d3
Author: Gordon Ball <gordon at chronitis.net>
Date:   Fri Jul 21 22:39:08 2017 +0200

    Convert from git-dpm to patches unapplied format
---
 debian/.git-dpm | 11 -----------
 debian/gbp.conf |  7 +++++++
 setup.py        |  3 ++-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index ab7d496..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-a3de825860b604054c15064aec23955b18e2d2bb
-a3de825860b604054c15064aec23955b18e2d2bb
-9b8893fc4b251ab7e27ce63876de31680b6ea03a
-9b8893fc4b251ab7e27ce63876de31680b6ea03a
-jupyter-console_5.1.0.orig.tar.gz
-08568e713fe150667416432ed712d407a361b24e
-26661
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..f53906f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = master
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+sign-tags = True
+pristine-tar = True
diff --git a/setup.py b/setup.py
index 27ce8a9..1f9a604 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,8 @@ setup_args = dict(
     ],
 )
 
-import setuptools
+if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv):
+    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/jupyter-console.git