Fixed Jython compatibility by making the ProcessPoolExecutor import optional

Added metadata for wheel support
This commit is contained in:
Alex Gr?nholm 2013-11-12 20:32:46 +02:00
parent 5d5b743fa8
commit 1a5bd793e4
4 changed files with 23 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2.1.5
=====
- Fixed Jython compatibility
- Added metadata for wheel support
2.1.4
=====

View File

@ -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

View File

@ -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'

View File

@ -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',