[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 d0cd7edd3bc31128c2090a7f9b94155dc91f1697
Merge: eb824fd 97c8c55
Author: Filip Pytloun <filip at pytloun.cz>
Date:   Mon Dec 11 17:33:49 2017 +0100

    merge patched into master

 click_threading/__init__.py                                     | 2 +-
 click_threading/_compat.py                                      | 3 +++
 click_threading/monkey.py                                       | 4 ++--
 debian/.git-dpm                                                 | 6 +++---
 debian/patches/0001-Fix-conditional-dependency-on-futures.patch | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 84b4b0f,0000000..414b965
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
- a6ab771391afe1f9c23349feac29d0682524782d
- a6ab771391afe1f9c23349feac29d0682524782d
- 09288b0632585c754fe840aa3b1211dbbfad5118
++97c8c550c212e571b1c1ec8a2feffc620d80aaa6
++97c8c550c212e571b1c1ec8a2feffc620d80aaa6
++2ed2031524cd760cea765e08045ad04aa2bea199
 +2ed2031524cd760cea765e08045ad04aa2bea199
 +python-click-threading_0.4.4.orig.tar.gz
 +5aedcc7165db1a92a8c6b82cca0b5c1a3084b194
 +9815
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-conditional-dependency-on-futures.patch
index 945c23f,0000000..7228966
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 a6ab771391afe1f9c23349feac29d0682524782d Mon Sep 17 00:00:00 2001
++From 97c8c550c212e571b1c1ec8a2feffc620d80aaa6 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