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

[Ondřej Nový]

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

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

commit 535f4cf17ec1ae2fd2ae36ed3aa0d7936373d596
Merge: 740dd8a 46f53aa
Author: Ondřej Nový <onovy at debian.org>
Date:   Wed Dec 28 22:51:42 2016 +0100

    merge patched into master

 .travis.yml                                        |   3 +-
 MANIFEST.in                                        |   5 +
 Makefile                                           |   5 +
 README.rst                                         |   6 +-
 click_threading/__init__.py                        |  59 ++++-
 click_threading/monkey.py                          |  57 ++++-
 debian/.git-dpm                                    |   6 +-
 ...001-Fix-conditional-dependency-on-futures.patch |   2 +-
 docs/Makefile                                      | 225 +++++++++++++++++
 docs/conf.py                                       | 112 ++++++++
 docs/index.rst                                     |   6 +
 docs/make.bat                                      | 281 +++++++++++++++++++++
 docs/threading.rst                                 |   7 +
 docs/uiworker.rst                                  |   7 +
 setup.cfg                                          |   3 +
 tests/test_basic.py                                |  41 ++-
 16 files changed, 802 insertions(+), 23 deletions(-)

diff --cc debian/.git-dpm
index c31fda0,0000000..ee629b2
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
- 6b4bd92e4caddbbf3f32c0d90ed0563c00732433
- 6b4bd92e4caddbbf3f32c0d90ed0563c00732433
- 577f318089c335e057efe6d5c72b9daedb1f6ce0
++46f53aa96cd16257d8098f0cf20a1efb393aa4ab
++46f53aa96cd16257d8098f0cf20a1efb393aa4ab
++ddbbcb36c608e7a1b1ef5e5a781cb82c23c4ac96
 +ddbbcb36c608e7a1b1ef5e5a781cb82c23c4ac96
 +python-click-threading_0.4.2.orig.tar.gz
 +50d98db867c0d63da8aa9fde154b16368b7128e7
 +9905
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-conditional-dependency-on-futures.patch
index 6374449,0000000..9a3498a
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 6b4bd92e4caddbbf3f32c0d90ed0563c00732433 Mon Sep 17 00:00:00 2001
++From 46f53aa96cd16257d8098f0cf20a1efb393aa4ab 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