Merge branch 'master' into master

promise/__init__.py

@@ -10,7 +10,7 @@
     __SETUP__ = False
 
 
-VERSION = (2, 2, 0, "rc", 1)
+VERSION = (2, 2, 0, "final", 0)
 
 __version__ = get_version(VERSION)
 

promise/compat.py

@@ -1,3 +1,11 @@
+try:
+    from inspect import iscoroutine
+except ImportError:
+
+    def iscoroutine(obj):  # type: ignore
+        return False
+
+
 try:
     from asyncio import Future, iscoroutine, ensure_future  # type: ignore
 except ImportError:
@@ -15,9 +23,6 @@ def set_exception(self):
     def ensure_future():  # type: ignore
         raise Exception("ensure_future needs asyncio for executing")
 
-    def iscoroutine(obj):  # type: ignore
-        return False
-
 
 try:
     from .iterate_promise import iterate_promise

setup.py

@@ -8,49 +8,54 @@
 
 builtins.__SETUP__ = True
 
-version = __import__('promise').get_version()
+version = __import__("promise").get_version()
 
 
 IS_PY3 = sys.hexversion >= 0x03000000
 
 tests_require = [
-    'pytest>=2.7.3', 'pytest-cov', 'coveralls', 'futures', 'pytest-benchmark',
-    'mock',
+    "pytest>=2.7.3",
+    "pytest-cov",
+    "coveralls",
+    "futures",
+    "pytest-benchmark",
+    "mock",
 ]
 if IS_PY3:
-    tests_require += ['pytest-asyncio']
+    tests_require += ["pytest-asyncio"]
 
 
 setup(
-    name='promise',
+    name="promise",
     version=version,
-    description='Promises/A+ implementation for Python',
-    long_description=open('README.rst').read(),
-    url='https://github.com/syrusakbary/promise',
-    download_url='https://github.com/syrusakbary/promise/releases',
-    author='Syrus Akbary',
-    author_email='[email protected]',
-    license='MIT',
+    description="Promises/A+ implementation for Python",
+    long_description=open("README.rst").read(),
+    url="https://github.com/syrusakbary/promise",
+    download_url="https://github.com/syrusakbary/promise/releases",
+    author="Syrus Akbary",
+    author_email="[email protected]",
+    license="MIT",
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Topic :: Software Development :: Libraries',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: Implementation :: PyPy',
-        'License :: OSI Approved :: MIT License',
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Topic :: Software Development :: Libraries",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "License :: OSI Approved :: MIT License",
     ],
-    keywords='concurrent future deferred promise',
-    packages=find_packages(exclude=['tests']),
-    extras_require={
-        'test': tests_require,
-    },
+    keywords="concurrent future deferred promise",
+    packages=find_packages(exclude=["tests"]),
+    # PEP-561: https://www.python.org/dev/peps/pep-0561/
+    package_data={"promise": ["py.typed"]},
+    extras_require={"test": tests_require},
     install_requires=[
         "typing>=3.6.4; python_version < '3.5'",
-        'six'
+        "six"
     ],
-    tests_require=tests_require, )
+    tests_require=tests_require,
+)