[Python-modules-commits] [python-click-threading] 02/02: merge patched into master

[Filip Pytloun]

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

fpytloun-guest pushed a commit to branch master
in repository python-click-threading.

commit 44181ceb116fcb68c61e83d061a095d57b2956da
Merge: cc7803c 6b4bd92
Author: Filip Pytloun <filip at pytloun.cz>
Date:   Fri Aug 12 11:23:21 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...001-Fix-conditional-dependency-on-futures.patch | 46 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           | 15 ++++---
 4 files changed, 58 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 6cc8328,0000000..398bf75
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
- 577f318089c335e057efe6d5c72b9daedb1f6ce0
- 577f318089c335e057efe6d5c72b9daedb1f6ce0
++6b4bd92e4caddbbf3f32c0d90ed0563c00732433
++6b4bd92e4caddbbf3f32c0d90ed0563c00732433
 +577f318089c335e057efe6d5c72b9daedb1f6ce0
 +577f318089c335e057efe6d5c72b9daedb1f6ce0
 +python-click-threading_0.4.0.orig.tar.gz
 +e86ac35f488c4dc9cc116d2cf764dd73318f6dee
 +3841
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-conditional-dependency-on-futures.patch
index 0000000,0000000..6374449
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-conditional-dependency-on-futures.patch
@@@ -1,0 -1,0 +1,46 @@@
++From 6b4bd92e4caddbbf3f32c0d90ed0563c00732433 Mon Sep 17 00:00:00 2001
++From: Filip Pytloun <filip at pytloun.cz>
++Date: Fri, 12 Aug 2016 11:23:17 +0200
++Subject: Fix conditional dependency on futures
++
++---
++ setup.py | 15 +++++++++------
++ 1 file changed, 9 insertions(+), 6 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 1b3d84f..0f7cd9c 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -1,5 +1,6 @@
++ #!/usr/bin/env python
++ 
+++import sys
++ import ast
++ import re
++ 
++@@ -11,6 +12,13 @@ with open('click_threading/__init__.py', 'rb') as f:
++     version = str(ast.literal_eval(_version_re.search(
++         f.read().decode('utf-8')).group(1)))
++ 
+++INSTALL_REQUIRES = [
+++    'click>=5.0',
+++]
+++
+++if sys.version_info[0] == 2:
+++    INSTALL_REQUIRES.append('futures')
+++
++ setup(
++     name='click-threading',
++     version=version,
++@@ -20,10 +28,5 @@ setup(
++     url='https://github.com/click-contrib/click-threading',
++     license='MIT',
++     packages=['click_threading'],
++-    install_requires=[
++-        'click>=5.0',
++-    ],
++-    extras_require={
++-        ':python_version < "3.2"': 'futures'
++-    }
+++    install_requires=INSTALL_REQUIRES
++ )
diff --cc debian/patches/series
index 0000000,0000000..8186d65
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-conditional-dependency-on-futures.patch

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