[Python-modules-commits] [python-click-threading] 04/05: 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 330fa0780a192101029cfb8a832c89d41f711964
Merge: 73fb80d a6ab771
Author: Filip Pytloun <filip at pytloun.cz>
Date:   Tue Jan 17 19:50:06 2017 +0100

    merge patched into master

 click_threading/__init__.py                                   |  2 +-
 debian/.git-dpm                                               |  6 +++---
 .../patches/0001-Fix-conditional-dependency-on-futures.patch  |  2 +-
 docs/conf.py                                                  | 11 ++---------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --cc debian/.git-dpm
index 5118840,0000000..885d681
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
- 46f53aa96cd16257d8098f0cf20a1efb393aa4ab
- 46f53aa96cd16257d8098f0cf20a1efb393aa4ab
- ddbbcb36c608e7a1b1ef5e5a781cb82c23c4ac96
++a6ab771391afe1f9c23349feac29d0682524782d
++a6ab771391afe1f9c23349feac29d0682524782d
++09288b0632585c754fe840aa3b1211dbbfad5118
 +09288b0632585c754fe840aa3b1211dbbfad5118
 +python-click-threading_0.4.3.orig.tar.gz
 +8c9d55f1e6e9257538c80a960d03aa23a57d5374
 +9791
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-conditional-dependency-on-futures.patch
index 9a3498a,0000000..945c23f
mode 100644,000000..100644
--- a/debian/patches/0001-Fix-conditional-dependency-on-futures.patch
+++ b/debian/patches/0001-Fix-conditional-dependency-on-futures.patch
@@@ -1,46 -1,0 +1,46 @@@
- From 46f53aa96cd16257d8098f0cf20a1efb393aa4ab Mon Sep 17 00:00:00 2001
++From a6ab771391afe1f9c23349feac29d0682524782d 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
 + )

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