merge patched into master
This commit is contained in:
commit
44181ceb11
4
debian/.git-dpm
vendored
4
debian/.git-dpm
vendored
|
@ -1,6 +1,6 @@
|
||||||
# see git-dpm(1) from git-dpm package
|
# see git-dpm(1) from git-dpm package
|
||||||
577f318089c335e057efe6d5c72b9daedb1f6ce0
|
6b4bd92e4caddbbf3f32c0d90ed0563c00732433
|
||||||
577f318089c335e057efe6d5c72b9daedb1f6ce0
|
6b4bd92e4caddbbf3f32c0d90ed0563c00732433
|
||||||
577f318089c335e057efe6d5c72b9daedb1f6ce0
|
577f318089c335e057efe6d5c72b9daedb1f6ce0
|
||||||
577f318089c335e057efe6d5c72b9daedb1f6ce0
|
577f318089c335e057efe6d5c72b9daedb1f6ce0
|
||||||
python-click-threading_0.4.0.orig.tar.gz
|
python-click-threading_0.4.0.orig.tar.gz
|
||||||
|
|
46
debian/patches/0001-Fix-conditional-dependency-on-futures.patch
vendored
Normal file
46
debian/patches/0001-Fix-conditional-dependency-on-futures.patch
vendored
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
From 6b4bd92e4caddbbf3f32c0d90ed0563c00732433 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Filip Pytloun <filip@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
|
||||||
|
)
|
1
debian/patches/series
vendored
Normal file
1
debian/patches/series
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
0001-Fix-conditional-dependency-on-futures.patch
|
15
setup.py
15
setup.py
|
@ -1,5 +1,6 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
|
import sys
|
||||||
import ast
|
import ast
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
@ -11,6 +12,13 @@ with open('click_threading/__init__.py', 'rb') as f:
|
||||||
version = str(ast.literal_eval(_version_re.search(
|
version = str(ast.literal_eval(_version_re.search(
|
||||||
f.read().decode('utf-8')).group(1)))
|
f.read().decode('utf-8')).group(1)))
|
||||||
|
|
||||||
|
INSTALL_REQUIRES = [
|
||||||
|
'click>=5.0',
|
||||||
|
]
|
||||||
|
|
||||||
|
if sys.version_info[0] == 2:
|
||||||
|
INSTALL_REQUIRES.append('futures')
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='click-threading',
|
name='click-threading',
|
||||||
version=version,
|
version=version,
|
||||||
|
@ -20,10 +28,5 @@ setup(
|
||||||
url='https://github.com/click-contrib/click-threading',
|
url='https://github.com/click-contrib/click-threading',
|
||||||
license='MIT',
|
license='MIT',
|
||||||
packages=['click_threading'],
|
packages=['click_threading'],
|
||||||
install_requires=[
|
install_requires=INSTALL_REQUIRES
|
||||||
'click>=5.0',
|
|
||||||
],
|
|
||||||
extras_require={
|
|
||||||
':python_version < "3.2"': 'futures'
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue