diff options
author | Alex Gr?nholm <alex.gronholm@nextday.fi> | 2013-11-12 20:32:46 +0200 |
---|---|---|
committer | Alex Gr?nholm <alex.gronholm@nextday.fi> | 2013-11-12 20:32:46 +0200 |
commit | ece5f3a325891bdbc664e3130c4758a20683c0ea (patch) | |
tree | 2f744999eaad9b1f6fd111339359143089b46180 | |
parent | 4690bf5e2a98a8cbe38055d34a91ed4a5da4220d (diff) | |
download | futures-ece5f3a325891bdbc664e3130c4758a20683c0ea.tar.gz |
Fixed Jython compatibility by making the ProcessPoolExecutor import optional2.1.5
Added metadata for wheel support
-rw-r--r-- | CHANGES | 7 | ||||
-rw-r--r-- | concurrent/futures/__init__.py | 7 | ||||
-rw-r--r-- | setup.cfg | 7 | ||||
-rwxr-xr-x | setup.py | 5 |
4 files changed, 23 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2.1.5 +===== + +- Fixed Jython compatibility +- Added metadata for wheel support + + 2.1.4 ===== diff --git a/concurrent/futures/__init__.py b/concurrent/futures/__init__.py index b5231f8..fef5281 100644 --- a/concurrent/futures/__init__.py +++ b/concurrent/futures/__init__.py @@ -14,5 +14,10 @@ from concurrent.futures._base import (FIRST_COMPLETED, Executor, wait, as_completed) -from concurrent.futures.process import ProcessPoolExecutor from concurrent.futures.thread import ThreadPoolExecutor + +# Jython doesn't have multiprocessing +try: + from concurrent.futures.process import ProcessPoolExecutor +except ImportError: + pass @@ -1,6 +1,13 @@ +[wheel] +universal = 1 + [build_sphinx] source-dir = docs build-dir = build/sphinx [upload_docs] upload-dir = build/sphinx/html + +[metadata] +requires-dist = + multiprocessing; python_version == '2.5' and platform.python_implementation != 'Jython' @@ -1,17 +1,18 @@ #!/usr/bin/env python import sys +import os extras = {} try: from setuptools import setup extras['zip_safe'] = False - if sys.version_info < (2, 6): + if sys.version_info < (2, 6) and os.name != 'java': extras['install_requires'] = ['multiprocessing'] except ImportError: from distutils.core import setup setup(name='futures', - version='2.1.4', + version='2.1.5', description='Backport of the concurrent.futures package from Python 3.2', author='Brian Quinlan', author_email='brian@sweetapp.com', |