merge patched into master

click_threading/__init__.py

@@ -21,7 +21,7 @@ try:
 except ImportError:
     from futures import Future as _Future
 
-__version__ = '0.4.2'
+__version__ = '0.4.3'
 
 _CTX_WORKER_KEY = __name__ + '.uiworker'
 

debian/.git-dpm

@@ -1,7 +1,7 @@
 # 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

debian/patches/0001-Fix-conditional-dependency-on-futures.patch

@@ -1,4 +1,4 @@
-From 46f53aa96cd16257d8098f0cf20a1efb393aa4ab Mon Sep 17 00:00:00 2001
+From a6ab771391afe1f9c23349feac29d0682524782d 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

docs/conf.py

@@ -25,15 +25,8 @@ project = 'click_threading'
 with open(os.path.join(os.path.dirname(__file__), '../LICENSE')) as f:
     copyright = next(iter(f))[len('Copyright (c) '):]
 
-try:
-    # The full version, including alpha/beta/rc tags.
-    release = pkg_resources.require(project)[0].version
-except pkg_resources.DistributionNotFound:
-    print('To build the documentation, the distribution information of '
-          '{} has to be available. Run "setup.py develop" to do '
-          'this.'.format(project))
-    sys.exit(1)
-
+import click_threading
+release = click_threading.__version__
 version = '.'.join(release.split('.')[:2])  # The short X.Y version.
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'